From 908f1e8bd002f6d3ca89a5154b7f2b314f621911 Mon Sep 17 00:00:00 2001
From: qijq <624811160@qq.com>
Date: Wed, 7 May 2025 16:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 activity/coupon/detail.vue        |   1 -
 helpers/loginPopup.js             |  15 -
 member/card/detail.vue            | 839 ++++++++++++++++--------------
 static/images/login/email.png     | Bin 2747 -> 0 bytes
 static/images/pay_type/alipay.png | Bin 1544 -> 0 bytes
 store/index.js                    |   1 -
 6 files changed, 449 insertions(+), 407 deletions(-)
 delete mode 100644 helpers/loginPopup.js
 delete mode 100644 static/images/login/email.png
 delete mode 100644 static/images/pay_type/alipay.png

diff --git a/activity/coupon/detail.vue b/activity/coupon/detail.vue
index 77add38..4d5d461 100644
--- a/activity/coupon/detail.vue
+++ b/activity/coupon/detail.vue
@@ -345,7 +345,6 @@
 
 <script>
 import $ from "../../helpers/util";
-import uniQrcode from "@/components/uni-qrcode/uni-qrcode.vue";
 
 import uQRCode from "@/components/uni-qrcode/uqrcode.js";
 import { mapState, mapMutations } from "vuex";
diff --git a/helpers/loginPopup.js b/helpers/loginPopup.js
deleted file mode 100644
index 9367a76..0000000
--- a/helpers/loginPopup.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import Vue from 'vue'
-
-import loginPopup from '@/components/loginPopup.vue'
- 
-const loginPopup_ =  Vue.extend(loginPopup)
-
-export const $loginPopup  = (data) =>{
-    const node = new loginPopup_({
-        show:data
-    })
-
-    node.$mount()
-
-    document.body.appendChild(node.$el)
-}
\ No newline at end of file
diff --git a/member/card/detail.vue b/member/card/detail.vue
index 3d27aaa..1d4f1d8 100644
--- a/member/card/detail.vue
+++ b/member/card/detail.vue
@@ -1,503 +1,562 @@
 <template>
-	<view class="page">
-		<block v-if="isdata">
-			<view class="u-pa1 fix-titlenview-trans">
-				<view class="m-banner-ad"><image :src="cardInfo.card_type_image" style="width: 100%;height: 100%;"></image></view>
-				<view class="m-activity-info">
-					<view class="m-activity-title">
-						<label>{{ cardInfo.card_type_name }}</label>
-					</view>
-					<view class="m-activity-price">
-						<view>
-							<label>{{ __('￥') }}{{ number_format(cardInfo.card_type_prize, 2) }}</label>
-							<label  style="padding:0rpx 30rpx;color:#888;">{{ __('剩余使用次数') }}   {{ cardInfo.not_num }}</label>
-						</view>
-					</view>
-				</view>
-				<uni-collapse :accordion="true" style="margin:20rpx 0rpx;background-color: #ffffff;" v-if="(info_id > 0  && cardInfo.card_write_code)">
-					<uni-collapse-item title="使用记录" :show-animation="true">
-						<view class="m-RichText">
-							<view class="m-code" v-for="(code, index) in cardInfo.items" :key="index">
-								<view>{{ code.card_write_code }}</view>
-								<view v-if="code.card_is_use == 1" style="color:#717171">{{ __('已使用') }}</view>
-								<view v-if="code.card_is_use == 0" style="color:#ff4142" :data-code="code.card_write_code" @click="Make">{{ __('使用') }}</view>
-							</view>
-						</view>
-					</uni-collapse-item>
-				</uni-collapse>
+  <view class="page">
+    <block v-if="isdata">
+      <view class="u-pa1 fix-titlenview-trans">
+        <view class="m-banner-ad"
+          ><image
+            :src="cardInfo.card_type_image"
+            style="width: 100%; height: 100%"
+          ></image
+        ></view>
+        <view class="m-activity-info">
+          <view class="m-activity-title">
+            <label>{{ cardInfo.card_type_name }}</label>
+          </view>
+          <view class="m-activity-price">
+            <view>
+              <label
+                >{{ __("￥")
+                }}{{ number_format(cardInfo.card_type_prize, 2) }}</label
+              >
+              <label style="padding: 0rpx 30rpx; color: #888"
+                >{{ __("剩余使用次数") }} {{ cardInfo.not_num }}</label
+              >
+            </view>
+          </view>
+        </view>
+        <uni-collapse
+          :accordion="true"
+          style="margin: 20rpx 0rpx; background-color: #ffffff"
+          v-if="info_id > 0 && cardInfo.card_write_code"
+        >
+          <uni-collapse-item title="使用记录" :show-animation="true">
+            <view class="m-RichText">
+              <view
+                class="m-code"
+                v-for="(code, index) in cardInfo.items"
+                :key="index"
+              >
+                <view>{{ code.card_write_code }}</view>
+                <view v-if="code.card_is_use == 1" style="color: #717171">{{
+                  __("已使用")
+                }}</view>
+                <view
+                  v-if="code.card_is_use == 0"
+                  style="color: #ff4142"
+                  :data-code="code.card_write_code"
+                  @click="Make"
+                  >{{ __("使用") }}</view
+                >
+              </view>
+            </view>
+          </uni-collapse-item>
+        </uni-collapse>
 
-				<view class="m-panel m-panel-access m-detail">
-					<view class="m-tab">
-						<view class="m-navbar">
-							<view class="m-navbar-item m-navbar-item-on">{{ __('使用规则') }}</view>
-						</view>
-					</view>
+        <view class="m-panel m-panel-access m-detail">
+          <view class="m-tab">
+            <view class="m-navbar">
+              <view class="m-navbar-item m-navbar-item-on">{{
+                __("使用规则")
+              }}</view>
+            </view>
+          </view>
 
-					<view class="m-RichText" v-if="cardInfo.card_rule"><wxParse :content="cardInfo.card_rule" /></view>
-				</view>
-				<view style="width:100%;height:100rpx;"></view>
+          <view class="m-RichText" v-if="cardInfo.card_rule"
+            ><wxParse :content="cardInfo.card_rule"
+          /></view>
+        </view>
+        <view style="width: 100%; height: 100rpx"></view>
 
-				<view class="u-cleanbox"></view>
+        <view class="u-cleanbox"></view>
 
-				<view class="m-footer-btn" v-if="card_code > 0">
-					<view class="m-footer-btn-list">
-						<view class="m-footer-btn-item m-cart-total">
-							<view>
-								{{ __('合计：') }}
-								<block v-if="cardInfo.card_type_prize.m">
-									<label>{{ __('￥') }}</label>
-									<text class="m-total-price">{{ number_format(cardInfo.card_type_prize, 2) }}</text>
-								</block>
-							</view>
-						</view>
-					</view>
-					<form report-submit="true" @submit="submitinfo">
-						<button class="m-footer-btn-main" formType="submit">{{ __('去支付') }}</button>
-					</form>
-				</view>
-			</view>
-		</block>
+        <view class="m-footer-btn" v-if="card_code > 0">
+          <view class="m-footer-btn-list">
+            <view class="m-footer-btn-item m-cart-total">
+              <view>
+                {{ __("合计：") }}
+                <block v-if="cardInfo.card_type_prize.m">
+                  <label>{{ __("￥") }}</label>
+                  <text class="m-total-price">{{
+                    number_format(cardInfo.card_type_prize, 2)
+                  }}</text>
+                </block>
+              </view>
+            </view>
+          </view>
+          <form report-submit="true" @submit="submitinfo">
+            <button class="m-footer-btn-main" formType="submit">
+              {{ __("去支付") }}
+            </button>
+          </form>
+        </view>
+      </view>
+    </block>
 
-		<view class="m-nullcontent" v-else>
-			<view class="m-nullpage-middle">
-				<label class="iconfont icon-meiyougengduo"></label>
-				<view class="m-null-tip">
-					<text>{{ __('亲~什么都没有') }}</text>
-				</view>
-			</view>
-		</view>
+    <view class="m-nullcontent" v-else>
+      <view class="m-nullpage-middle">
+        <label class="iconfont icon-meiyougengduo"></label>
+        <view class="m-null-tip">
+          <text>{{ __("亲~什么都没有") }}</text>
+        </view>
+      </view>
+    </view>
 
-		<payment-box :paymentDataDefault="paymentData" :order_id="order_id" ref="paymentBox" @onCancel="onCancel" @onPaid="onPaid" @onFail="onFail"></payment-box>
+    <payment-box
+      :paymentDataDefault="paymentData"
+      :order_id="order_id"
+      ref="paymentBox"
+      @onCancel="onCancel"
+      @onPaid="onPaid"
+      @onFail="onFail"
+    ></payment-box>
 
-		<!-- 弹出层 -->
+    <!-- 弹出层 -->
 
-		<view :class="bannerShow ? 'tailfoli' : 'hide'" @click="setHide"><canvas class="m-canvas" canvas-id="qrcode" style="width: 200px;height: 200px;" /></view>
-	</view>
+    <view :class="bannerShow ? 'tailfoli' : 'hide'" @click="setHide"
+      ><canvas
+        class="m-canvas"
+        canvas-id="qrcode"
+        style="width: 200px; height: 200px"
+    /></view>
+  </view>
 </template>
 
 <script>
-import { mapState, mapMutations } from 'vuex';
+import { mapState, mapMutations } from "vuex";
 
-import uniQrcode from '@/components/uni-qrcode/uni-qrcode.vue';
+import uQRCode from "@/components/uni-qrcode/uqrcode.js";
 
-import uQRCode from '@/components/uni-qrcode/uqrcode.js';
+import wxParse from "@/components/u-parse/u-parse.vue";
+import paymentBox from "../../components/payment-box.vue";
 
-import wxParse from '@/components/u-parse/u-parse.vue';
-import paymentBox from '../../components/payment-box.vue';
-
-import uniCollapse from '@/components/uni-collapse/uni-collapse.vue';
-import uniCollapseItem from '@/components/uni-collapse-item/uni-collapse-item.vue';
+import uniCollapse from "@/components/uni-collapse/uni-collapse.vue";
+import uniCollapseItem from "@/components/uni-collapse-item/uni-collapse-item.vue";
 
 export default {
-	data() {
-		return {
-			card_code: 0,
-			isdata: false,
-			cardInfo: {},
-			bannerShow: false,
-			paymentData: {},
-			order_id: '',
-			order_price: 0,
-			info_id: 0
-		};
-	},
+  data() {
+    return {
+      card_code: 0,
+      isdata: false,
+      cardInfo: {},
+      bannerShow: false,
+      paymentData: {},
+      order_id: "",
+      order_price: 0,
+      info_id: 0,
+    };
+  },
 
-	components: {
-		wxParse,
-		paymentBox,
-		uniQrcode,
-		uniCollapse,
-		uniCollapseItem
-	},
+  components: {
+    wxParse,
+    paymentBox,
+    uniCollapse,
+    uniCollapseItem,
+  },
 
-	computed: mapState(['Config', 'StateCode', 'notice', 'plantformInfo', 'shopInfo', 'userInfo', 'hasLogin']),
-	onLoad: function(options) {
-		uni.setNavigationBarTitle({
-			title: this.__('卡片详情')
-		});
-		if (options.cid) {
-			this.setData({
-				card_code: options.cid
-			});
+  computed: mapState([
+    "Config",
+    "StateCode",
+    "notice",
+    "plantformInfo",
+    "shopInfo",
+    "userInfo",
+    "hasLogin",
+  ]),
+  onLoad: function (options) {
+    uni.setNavigationBarTitle({
+      title: this.__("卡片详情"),
+    });
+    if (options.cid) {
+      this.setData({
+        card_code: options.cid,
+      });
 
-			this.getCard();
-		} else {
-			this.setData({
-				info_id: options.fid
-			});
+      this.getCard();
+    } else {
+      this.setData({
+        info_id: options.fid,
+      });
 
-			this.getCardInfo();
-		}
+      this.getCardInfo();
+    }
 
-		// that.$.setNavigationBarTitle({
-		// 	title: data.item_row.product_item_name
-		// });
-	},
+    // that.$.setNavigationBarTitle({
+    // 	title: data.item_row.product_item_name
+    // });
+  },
 
-	methods: {
-		...mapMutations(['login', 'logout', 'getPlantformInfo', 'forceUserInfo', 'getUserInfo']),
+  methods: {
+    ...mapMutations([
+      "login",
+      "logout",
+      "getPlantformInfo",
+      "forceUserInfo",
+      "getUserInfo",
+    ]),
 
-		getCardInfo: function() {
-			var that = this,
-				params = {
-					card_code: that.info_id
-				};
-			
-			that.$.request({
-				url: that.Config.URL.card.card_info_get,
-				data: params,
-				success: function(data, status, msg, code) {
-					if (status == 200 && data) {
-						that.setData({
-							isdata: true,
-							cardInfo: data
-						});
-					} else {
-						that.setData({
-							isdata: false
-						});
-						that.$.alert(msg);
-					}
-				}
-			});
-		},
+    getCardInfo: function () {
+      var that = this,
+        params = {
+          card_code: that.info_id,
+        };
 
-		getCard: function() {
-			var that = this,
-				params = {
-					card_code: that.card_code
-				};
+      that.$.request({
+        url: that.Config.URL.card.card_info_get,
+        data: params,
+        success: function (data, status, msg, code) {
+          if (status == 200 && data) {
+            that.setData({
+              isdata: true,
+              cardInfo: data,
+            });
+          } else {
+            that.setData({
+              isdata: false,
+            });
+            that.$.alert(msg);
+          }
+        },
+      });
+    },
 
-			that.$.request({
-				url: that.Config.URL.card.card_get,
-				data: params,
-				success: function(data, status, msg, code) {
-					if (status == 200 && data) {
-						that.setData({
-							isdata: true,
-							cardInfo: data
-						});
-						console.log(that.cardInfo);
-					} else {
-						that.setData({
-							isdata: false
-						});
-						that.$.alert(msg);
-					}
-				}
-			});
-		},
+    getCard: function () {
+      var that = this,
+        params = {
+          card_code: that.card_code,
+        };
 
-		setHide: function() {
-			this.setData({
-				bannerShow: false
-			});
-		},
+      that.$.request({
+        url: that.Config.URL.card.card_get,
+        data: params,
+        success: function (data, status, msg, code) {
+          if (status == 200 && data) {
+            that.setData({
+              isdata: true,
+              cardInfo: data,
+            });
+            console.log(that.cardInfo);
+          } else {
+            that.setData({
+              isdata: false,
+            });
+            that.$.alert(msg);
+          }
+        },
+      });
+    },
 
-		Make: function(e) {
-			var that = this;
+    setHide: function () {
+      this.setData({
+        bannerShow: false,
+      });
+    },
 
-			that.setData({
-				bannerShow: true
-			});
+    Make: function (e) {
+      var that = this;
 
+      that.setData({
+        bannerShow: true,
+      });
 
+      uQRCode.make({
+        canvasId: "qrcode",
+        componentInstance: this,
+        text: e.target.dataset.code,
+        size: 200,
+        margin: 10,
+        backgroundColor: "#ffffff",
+        foregroundColor: "#000000",
+        fileType: "jpg",
+        // correctLevel: uQRCode.errorCorrectLevel.H,
+        success: (res) => {
+          //console.log(res);
+        },
+        fail: (error) => {
+          //console.log(error);
+        },
+      });
+    },
 
-			uQRCode.make({
-				canvasId: 'qrcode',
-				componentInstance: this,
-				text:e.target.dataset.code,
-				size: 200,
-				margin: 10,
-				backgroundColor: '#ffffff',
-				foregroundColor: '#000000',
-				fileType: 'jpg',
-				// correctLevel: uQRCode.errorCorrectLevel.H,
-				success: res => {
-					//console.log(res);
-				},
-				fail: error => {
-					//console.log(error);
-				}
-			});
-		},
+    submitinfo: function (e) {
+      var that = this;
 
-		submitinfo: function(e) {
-			var that = this;
+      var params = {
+        card_id: that.cardInfo.card_type_id,
+      };
+      that.$.request({
+        type: "post",
+        url: that.Config.URL.pay.card_fee,
+        data: params,
+        success: function (data, status, msg, code) {
+          if (status == 200) {
+            that.setData({
+              order_id: data.pay_sn,
+              order_price: data.p_amount,
+            });
 
-			var params = {
-				card_id: that.cardInfo.card_type_id
-			};
-			that.$.request({
-				type: 'post',
-				url: that.Config.URL.pay.card_fee,
-				data: params,
-				success: function(data, status, msg, code) {
-					if (status == 200) {
-						that.setData({
-							order_id: data.pay_sn,
-							order_price: data.p_amount
-						});
+            that.gotopay();
+          }
+        },
+      });
+    },
 
-						that.gotopay();
-					}
-				}
-			});
-		},
+    gotopay: function (type_id) {
+      var that = this;
+      var order_price = that.order_price;
+      that.setData({
+        order_id: that.order_id,
+        paymentData: {
+          order_id: that.order_id,
+          orderSelMoneyAmount: order_price,
+          user_money: that.userInfo.user_money,
+        },
+      });
 
-		gotopay: function(type_id) {
-			var that = this;
-			var order_price = that.order_price;
-			that.setData({
-				order_id: that.order_id,
-				paymentData: {
-					order_id: that.order_id,
-					orderSelMoneyAmount: order_price,
-					user_money: that.userInfo.user_money
-				}
-			});
+      this.$refs.paymentBox.show();
+      return true;
 
-			this.$refs.paymentBox.show();
-			return true;
+      var param = {
+        order_id: this.order_id,
+        openid: this.userInfo.openId,
+        /* store_id: this.shopInfo.store_id, */
+        typ: "json",
+        payment_channel_code: "wx_native",
+        prepay_flag: 1,
+      };
 
-			var param = {
-				order_id: this.order_id,
-				openid: this.userInfo.openId,
-				/* store_id: this.shopInfo.store_id, */
-				typ: 'json',
-				payment_channel_code: 'wx_native',
-				prepay_flag: 1
-			};
+      var that = this;
 
-			var that = this;
+      that.$.request({
+        url: this.Config.URL.pay.pay,
+        data: param,
+        success: function (data, status, msg, code) {
+          if (status == 200) {
+            that.$.requestPayment({
+              timeStamp: data.timeStamp,
+              nonceStr: data.nonceStr,
+              package: data.package,
+              signType: data.signType,
+              paySign: data.paySign,
+              success: function (n) {
+                that.returnUrl(param.order_id);
+              },
+              fail: function (e) {},
+              complete: function (n) {
+                n.errMsg == "requestPayment:cancel" &&
+                  (that.$.redirectTo(
+                    "../rechargeorderdetail/rechargeorderdetail?on=" +
+                      param.order_id
+                  ),
+                  that.sendMessage(param.order_id, 1));
+              },
+            });
+          } else {
+            that.$.alert(msg);
+          }
+        },
 
-			that.$.request({
-				url: this.Config.URL.pay.pay,
-				data: param,
-				success: function(data, status, msg, code) {
-					if (status == 200) {
-						that.$.requestPayment({
-							timeStamp: data.timeStamp,
-							nonceStr: data.nonceStr,
-							package: data.package,
-							signType: data.signType,
-							paySign: data.paySign,
-							success: function(n) {
-								that.returnUrl(param.order_id);
-							},
-							fail: function(e) {},
-							complete: function(n) {
-								n.errMsg == 'requestPayment:cancel' &&
-									(that.$.redirectTo('../rechargeorderdetail/rechargeorderdetail?on=' + param.order_id), that.sendMessage(param.order_id, 1));
-							}
-						});
-					} else {
-						that.$.alert(msg);
-					}
-				},
+        fail: function (err) {},
+      });
+    },
+    onCancel: function (e) {
+      return;
+    },
+    onPaid: function (e) {
+      let that = this;
 
-				fail: function(err) {}
-			});
-		},
-		onCancel: function(e) {
-			return;
-		},
-		onPaid: function(e) {
-			let that = this;
+      that.$.alert("支付成功！", function () {
+        that.$refs.paymentBox.cancel();
+        //that.InitPage(that.options);
 
-			that.$.alert('支付成功！', function() {
-				that.$refs.paymentBox.cancel();
-				//that.InitPage(that.options);
-
-				//that.notice.postNotificationName("RefreshMessage", e)
-				setTimeout(function() {
-					that.$.gotopage('/member/card/user_list');
-				}, 1500);
-			});
-		},
-		onFail: function(e) {
-			let that = this;
-			that.$.alert('支付失败！');
-			//console.log("支付失败：", e)
-		}
-	}
+        //that.notice.postNotificationName("RefreshMessage", e)
+        setTimeout(function () {
+          that.$.gotopage("/member/card/user_list");
+        }, 1500);
+      });
+    },
+    onFail: function (e) {
+      let that = this;
+      that.$.alert("支付失败！");
+      //console.log("支付失败：", e)
+    },
+  },
 };
 </script>
 
 <style lang="scss">
-@import '../../styles/_variables';
+@import "../../styles/_variables";
 
 .m-coupon-list {
-	// margin-top: 36rpx
+  // margin-top: 36rpx
 }
 
 .fix-titlenview-trans {
-	background: #f5f6f7;
+  background: #f5f6f7;
 }
 
 .m-banner-ad {
-	width: 100%;
-	height: 300rpx;
-	background: rgba(0, 0, 0, 0);
-	opacity: 1;
+  width: 100%;
+  height: 300rpx;
+  background: rgba(0, 0, 0, 0);
+  opacity: 1;
 
-	position: relative;
+  position: relative;
 }
 
 .m-activity-info {
-	// width: 100%;
-	height: 140rpx;
-	background: #ffffff;
-	opacity: 1;
-	padding: 16rpx 24rpx;
+  // width: 100%;
+  height: 140rpx;
+  background: #ffffff;
+  opacity: 1;
+  padding: 16rpx 24rpx;
 }
 
 .m-panel {
-	margin-top: 0;
+  margin-top: 0;
 }
 
 .m-activity-title {
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: 400;
-	line-height: 42rpx;
-	color: #002951;
-	opacity: 1;
+  font-size: 30rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  line-height: 42rpx;
+  color: #002951;
+  opacity: 1;
 
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .m-activity-tips {
-	font-size: 20rpx;
-	font-family: PingFang SC;
-	font-weight: 400;
-	line-height: 28px;
-	color: #002951;
-	opacity: 0.6;
+  font-size: 20rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  line-height: 28px;
+  color: #002951;
+  opacity: 0.6;
 
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .m-activity-price {
-	font-size: 28rpx;
-	font-family: Arial;
-	font-weight: 400;
-	line-height: 28rpx;
-	color: #ff4142;
-	opacity: 1;
-	margin-top: 12rpx;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	justify-content: space-between;
+  font-size: 28rpx;
+  font-family: Arial;
+  font-weight: 400;
+  line-height: 28rpx;
+  color: #ff4142;
+  opacity: 1;
+  margin-top: 12rpx;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: space-between;
 }
 
 .m-footer-btn {
-	height: 100rpx;
-	width: 100%;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	background-color: #fff;
-	border-top: 1rpx solid #d5d5d5;
-	border-radius: 0;
-	z-index: 100;
+  height: 100rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background-color: #fff;
+  border-top: 1rpx solid #d5d5d5;
+  border-radius: 0;
+  z-index: 100;
 }
 
 .m-footer-btn-main {
-	width: 30%;
-	height: 100%;
-	float: left;
-	background-color: $default-skin-bg;
-	color: #fff;
-	line-height: 100rpx;
-	font-size: 32rpx;
-	text-align: center;
-	border-radius: 0;
+  width: 30%;
+  height: 100%;
+  float: left;
+  background-color: $default-skin-bg;
+  color: #fff;
+  line-height: 100rpx;
+  font-size: 32rpx;
+  text-align: center;
+  border-radius: 0;
 }
 
 .m-footer-btn-list {
-	width: 70%;
-	height: 100%;
-	position: relative;
-	float: left;
+  width: 70%;
+  height: 100%;
+  position: relative;
+  float: left;
 }
 
 .m-footer-btn-item {
-	position: relative;
-	float: left;
-	width: 100%;
-	font-size: 24rpx;
-	color: #888;
-	line-height: 40rpx;
-	padding: 15rpx 0;
-	box-sizing: border-box;
-	height: 100%;
+  position: relative;
+  float: left;
+  width: 100%;
+  font-size: 24rpx;
+  color: #888;
+  line-height: 40rpx;
+  padding: 15rpx 0;
+  box-sizing: border-box;
+  height: 100%;
 }
 
 .m-cart-total {
-	text-align: right;
-	padding-right: 20rpx;
+  text-align: right;
+  padding-right: 20rpx;
 }
 
 .m-cart-total text {
-	font-size: 36rpx;
-	color: $default-skin-bg;
+  font-size: 36rpx;
+  color: $default-skin-bg;
 }
 
 .m-cart-total label {
-	color: $default-skin-bg;
+  color: $default-skin-bg;
 }
 
 .m-code {
-	padding: 20rpx;
-	display: flex;
-	justify-content: space-between;
+  padding: 20rpx;
+  display: flex;
+  justify-content: space-between;
 }
 
 /* 弹出层形式的广告 */
 .uni-banner {
-	width: 70%;
-	height: 20%;
-	position: fixed;
-	left: 50%;
-	top: 50%;
-	border-radius: 10rpx;
-	z-index: 99;
-	transform: translate(-50%, -50%);
-	background: #ffffff;
+  width: 70%;
+  height: 20%;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  border-radius: 10rpx;
+  z-index: 99;
+  transform: translate(-50%, -50%);
+  background: #ffffff;
 }
 
 .m-conter {
-	width: 100%;
-	height: 200rpx;
-	margin-top: 20rpx;
+  width: 100%;
+  height: 200rpx;
+  margin-top: 20rpx;
 }
 
 .m-canvas {
-	position: absolute !important; /*重要的一步是设置绝对定位*/
-	margin: auto; /*将四周边距都设为auto自动*/
-	left: 0; /*离包含元素的距离均设为零*/
-	right: 0;
-	top: 0;
-	bottom: 0;
+  position: absolute !important; /*重要的一步是设置绝对定位*/
+  margin: auto; /*将四周边距都设为auto自动*/
+  left: 0; /*离包含元素的距离均设为零*/
+  right: 0;
+  top: 0;
+  bottom: 0;
 }
 
 .tailfoli {
-	background: rgba(0, 0, 0, 0.6);
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	left: 0;
-	top: 0;
-	z-index: 99;
+  background: rgba(0, 0, 0, 0.6);
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  z-index: 99;
 }
 
-.m-RichText{
-	background-color: #ffffff;
+.m-RichText {
+  background-color: #ffffff;
 }
 </style>
diff --git a/static/images/login/email.png b/static/images/login/email.png
deleted file mode 100644
index cdfa6c5e9841914e04c804db749597a434f58bf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2747
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
BLJa@_

diff --git a/static/images/pay_type/alipay.png b/static/images/pay_type/alipay.png
deleted file mode 100644
index 4c51c7665fb73d8fb486b952b8702a31f9906674..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1544
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

diff --git a/store/index.js b/store/index.js
index 83c753e..cddf7cf 100644
--- a/store/index.js
+++ b/store/index.js
@@ -12,7 +12,6 @@ import $cookies from '../helpers/vue-cookies';
 import Config from '../config/config';
 import StateCode from '../config/statecode';
 import Lang from '../config/lang';
-import { $loginPopup } from '../helpers/loginPopup.js';
 
 import notice from '../helpers/notice';