activity/coupon/detail.vue

@@ -345,6 +345,7 @@
 
 <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";

components/loginPopup.vue

@@ -201,7 +201,7 @@ export default {
 
       that.$.request({
         url: that.Config.URL.user.overview,
-        success: function (results, status, msg, code) {
+        success: function (data, status, msg, code) {
           that.login(data);
           that.reloadUserResource(function (user_info) {
             that.setData({

helpers/loginPopup.js

@@ -0,0 +1,15 @@
+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)
+}

member/card/detail.vue

@@ -2,51 +2,25 @@
 	<view class="page">
 		<block v-if="isdata">
 			<view class="u-pa1 fix-titlenview-trans">
-        <view class="m-banner-ad"
+				<view class="m-banner-ad"><image :src="cardInfo.card_type_image" style="width: 100%;height: 100%;"></image></view>
-          ><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
+							<label>{{ __('￥') }}{{ number_format(cardInfo.card_type_prize, 2) }}</label>
-                >{{ __("￥")
+							<label  style="padding:0rpx 30rpx;color:#888;">{{ __('剩余使用次数') }}   {{ cardInfo.not_num }}</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
+				<uni-collapse :accordion="true" style="margin:20rpx 0rpx;background-color: #ffffff;" v-if="(info_id > 0  && cardInfo.card_write_code)">
-          :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
+							<view class="m-code" v-for="(code, index) in cardInfo.items" :key="index">
-                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 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
-                  v-if="code.card_is_use == 0"
-                  style="color: #ff4142"
-                  :data-code="code.card_write_code"
-                  @click="Make"
-                  >{{ __("使用") }}</view
-                >
 							</view>
 						</view>
 					</uni-collapse-item>
@@ -55,17 +29,13 @@
 				<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 class="m-navbar-item m-navbar-item-on">{{ __('使用规则') }}</view>
-                __("使用规则")
-              }}</view>
 						</view>
 					</view>
 
-          <view class="m-RichText" v-if="cardInfo.card_rule"
+					<view class="m-RichText" v-if="cardInfo.card_rule"><wxParse :content="cardInfo.card_rule" /></view>
-            ><wxParse :content="cardInfo.card_rule"
-          /></view>
 				</view>
-        <view style="width: 100%; height: 100rpx"></view>
+				<view style="width:100%;height:100rpx;"></view>
 
 				<view class="u-cleanbox"></view>
 
@@ -73,20 +43,16 @@
 					<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>
+									<label>{{ __('￥') }}</label>
-                  <text class="m-total-price">{{
+									<text class="m-total-price">{{ number_format(cardInfo.card_type_prize, 2) }}</text>
-                    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 class="m-footer-btn-main" formType="submit">{{ __('去支付') }}</button>
-              {{ __("去支付") }}
-            </button>
 					</form>
 				</view>
 			</view>
@@ -96,41 +62,31 @@
 			<view class="m-nullpage-middle">
 				<label class="iconfont icon-meiyougengduo"></label>
 				<view class="m-null-tip">
-          <text>{{ __("亲~什么都没有") }}</text>
+					<text>{{ __('亲~什么都没有') }}</text>
 				</view>
 			</view>
 		</view>
 
-    <payment-box
+		<payment-box :paymentDataDefault="paymentData" :order_id="order_id" ref="paymentBox" @onCancel="onCancel" @onPaid="onPaid" @onFail="onFail"></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"
+		<view :class="bannerShow ? 'tailfoli' : 'hide'" @click="setHide"><canvas class="m-canvas" canvas-id="qrcode" style="width: 200px;height: 200px;" /></view>
-      ><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 uQRCode from "@/components/uni-qrcode/uqrcode.js";
+import uniQrcode from '@/components/uni-qrcode/uni-qrcode.vue';
 
-import wxParse from "@/components/u-parse/u-parse.vue";
+import uQRCode from '@/components/uni-qrcode/uqrcode.js';
-import paymentBox from "../../components/payment-box.vue";
 
-import uniCollapse from "@/components/uni-collapse/uni-collapse.vue";
+import wxParse from '@/components/u-parse/u-parse.vue';
-import uniCollapseItem from "@/components/uni-collapse-item/uni-collapse-item.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';
 
 export default {
 	data() {
@@ -140,41 +96,34 @@ export default {
 			cardInfo: {},
 			bannerShow: false,
 			paymentData: {},
-      order_id: "",
+			order_id: '',
 			order_price: 0,
-      info_id: 0,
+			info_id: 0
 		};
 	},
 
 	components: {
 		wxParse,
 		paymentBox,
+		uniQrcode,
 		uniCollapse,
-    uniCollapseItem,
+		uniCollapseItem
 	},
 
-  computed: mapState([
+	computed: mapState(['Config', 'StateCode', 'notice', 'plantformInfo', 'shopInfo', 'userInfo', 'hasLogin']),
-    "Config",
-    "StateCode",
-    "notice",
-    "plantformInfo",
-    "shopInfo",
-    "userInfo",
-    "hasLogin",
-  ]),
 	onLoad: function(options) {
 		uni.setNavigationBarTitle({
-      title: this.__("卡片详情"),
+			title: this.__('卡片详情')
 		});
 		if (options.cid) {
 			this.setData({
-        card_code: options.cid,
+				card_code: options.cid
 			});
 
 			this.getCard();
 		} else {
 			this.setData({
-        info_id: options.fid,
+				info_id: options.fid
 			});
 
 			this.getCardInfo();
@@ -186,18 +135,12 @@ export default {
 	},
 
 	methods: {
-    ...mapMutations([
+		...mapMutations(['login', 'logout', 'getPlantformInfo', 'forceUserInfo', 'getUserInfo']),
-      "login",
-      "logout",
-      "getPlantformInfo",
-      "forceUserInfo",
-      "getUserInfo",
-    ]),
 
 		getCardInfo: function() {
 			var that = this,
 				params = {
-          card_code: that.info_id,
+					card_code: that.info_id
 				};
 			
 			that.$.request({
@@ -207,22 +150,22 @@ export default {
 					if (status == 200 && data) {
 						that.setData({
 							isdata: true,
-              cardInfo: data,
+							cardInfo: data
 						});
 					} else {
 						that.setData({
-              isdata: false,
+							isdata: false
 						});
 						that.$.alert(msg);
 					}
-        },
+				}
 			});
 		},
 
 		getCard: function() {
 			var that = this,
 				params = {
-          card_code: that.card_code,
+					card_code: that.card_code
 				};
 
 			that.$.request({
@@ -232,22 +175,22 @@ export default {
 					if (status == 200 && data) {
 						that.setData({
 							isdata: true,
-              cardInfo: data,
+							cardInfo: data
 						});
 						console.log(that.cardInfo);
 					} else {
 						that.setData({
-              isdata: false,
+							isdata: false
 						});
 						that.$.alert(msg);
 					}
-        },
+				}
 			});
 		},
 
 		setHide: function() {
 			this.setData({
-        bannerShow: false,
+				bannerShow: false
 			});
 		},
 
@@ -255,25 +198,27 @@ export default {
 			var that = this;
 
 			that.setData({
-        bannerShow: true,
+				bannerShow: true
 			});
 
+
+
 			uQRCode.make({
-        canvasId: "qrcode",
+				canvasId: 'qrcode',
 				componentInstance: this,
 				text:e.target.dataset.code,
 				size: 200,
 				margin: 10,
-        backgroundColor: "#ffffff",
+				backgroundColor: '#ffffff',
-        foregroundColor: "#000000",
+				foregroundColor: '#000000',
-        fileType: "jpg",
+				fileType: 'jpg',
 				// correctLevel: uQRCode.errorCorrectLevel.H,
-        success: (res) => {
+				success: res => {
 					//console.log(res);
 				},
-        fail: (error) => {
+				fail: error => {
 					//console.log(error);
-        },
+				}
 			});
 		},
 
@@ -281,22 +226,22 @@ export default {
 			var that = this;
 
 			var params = {
-        card_id: that.cardInfo.card_type_id,
+				card_id: that.cardInfo.card_type_id
 			};
 			that.$.request({
-        type: "post",
+				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,
+							order_price: data.p_amount
 						});
 
 						that.gotopay();
 					}
-        },
+				}
 			});
 		},
 
@@ -308,8 +253,8 @@ export default {
 				paymentData: {
 					order_id: that.order_id,
 					orderSelMoneyAmount: order_price,
-          user_money: that.userInfo.user_money,
+					user_money: that.userInfo.user_money
-        },
+				}
 			});
 
 			this.$refs.paymentBox.show();
@@ -319,9 +264,9 @@ export default {
 				order_id: this.order_id,
 				openid: this.userInfo.openId,
 				/* store_id: this.shopInfo.store_id, */
-        typ: "json",
+				typ: 'json',
-        payment_channel_code: "wx_native",
+				payment_channel_code: 'wx_native',
-        prepay_flag: 1,
+				prepay_flag: 1
 			};
 
 			var that = this;
@@ -342,20 +287,16 @@ export default {
 							},
 							fail: function(e) {},
 							complete: function(n) {
-                n.errMsg == "requestPayment:cancel" &&
+								n.errMsg == 'requestPayment:cancel' &&
-                  (that.$.redirectTo(
+									(that.$.redirectTo('../rechargeorderdetail/rechargeorderdetail?on=' + param.order_id), that.sendMessage(param.order_id, 1));
-                    "../rechargeorderdetail/rechargeorderdetail?on=" +
+							}
-                      param.order_id
-                  ),
-                  that.sendMessage(param.order_id, 1));
-              },
 						});
 					} else {
 						that.$.alert(msg);
 					}
 				},
 
-        fail: function (err) {},
+				fail: function(err) {}
 			});
 		},
 		onCancel: function(e) {
@@ -364,27 +305,27 @@ export default {
 		onPaid: function(e) {
 			let that = this;
 
-      that.$.alert("支付成功！", function () {
+			that.$.alert('支付成功！', function() {
 				that.$refs.paymentBox.cancel();
 				//that.InitPage(that.options);
 
 				//that.notice.postNotificationName("RefreshMessage", e)
 				setTimeout(function() {
-          that.$.gotopage("/member/card/user_list");
+					that.$.gotopage('/member/card/user_list');
 				}, 1500);
 			});
 		},
 		onFail: function(e) {
 			let that = this;
-      that.$.alert("支付失败！");
+			that.$.alert('支付失败！');
 			//console.log("支付失败：", e)
-    },
+		}
-  },
+	}
 };
 </script>
 
 <style lang="scss">
-@import "../../styles/_variables";
+@import '../../styles/_variables';
 
 .m-coupon-list {
 	// margin-top: 36rpx

pages/product/detail.vue

@@ -3716,11 +3716,6 @@ export default {
     tplGoToPage: function (e) {
       let that = this;
 
-      if (!this.hasLogin) {
-        this.showLoginPopup = true;
-        return;
-      }
-
       //先判断是否登录
       this.forceUserInfo(function (user) {
         var t = e.currentTarget.dataset;

store/index.js

@@ -12,6 +12,7 @@ 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';