11

components/auth/index.vue

 <template>
+  <!-- v-if="setting&&setting.is_show_auth==1" -->
   <div class="auth-page">
     <u-popup
       v-model="showDialog"
@@ -21,7 +22,6 @@
 		    v-if="AppConfig.TenantId!=18"
 		    @tap="showLogin == true ? getUserProfile() : ''"
 		  ></button>
-		  
 			<button v-else
 			  :style="sureStyle"
 			  class="hotsopt"
@@ -63,6 +63,7 @@ export default {
 	  AppConfig:{
 		  TenantId:0
 	  },
+      setting: {},
     };
   },
   created() {
@@ -78,6 +79,9 @@ export default {
     let y = this.pageinfo.hotspot_cancel;
     this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`;
     this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`;
+    let set = uni.getStorageSync("basedata") ?
+				uni.getStorageSync("basedata").mall.setting : {};
+    this.setting = set;
   },
   methods: {
 	  //授权获取手机号码
@@ -209,6 +213,7 @@ export default {
           if (res.resultCode == 1) {
             obj.OpenId = res.data;
             that.getLogin(obj);
+
           }
         }
       );
@@ -289,7 +294,31 @@ export default {
               //不是相亲模式的时候去更新头像和昵称
               that.updateuserinfo(that.msg); //更新用户头像
             }
+            if(uni.getStorageSync('jzTravelOpenId')){
+                that.SetMemberBindCustomer()
+            }
+          }
+        }
+      );
+    },
+    SetMemberBindCustomer(){
+      let that = this;
+      that.request2({
+          url: "/api/MemberUser/SetMemberBindCustomer",
+          data: {
+            Id: that.msg.Id,
+            CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
+          },
+        },
+        (res) => {
+          if (res.resultCode == 1) {
+            uni.removeStorageSync('jzTravelOpenId');
           }
+        },(err) => {
+          // uni.showToast({
+          //     title: err.message,
+          //     icon: "none",
+          //   });
         }
       );
     },

components/miaiactivityCustom/style5.vue

@@ -147,7 +147,11 @@
 		width: 24px;
 		text-align: right;
 	}
-	.her_Two_study {
		overflow-x: auto !important;
		display: flex;
		white-space: nowrap;
	}
+	.her_Two_study {
+		overflow-x: auto !important;
+		display: flex;
+		white-space: nowrap;
+	}
 	.style_five_label{
 		float:left;
 		padding: 0px 5px;

components/studyArticle/style5.vue

@@ -136,7 +136,11 @@
 		width: 24px;
 		text-align: right;
 	}
-	.her_Two_study {
		overflow-x: auto !important;
		display: flex;
		white-space: nowrap;
	}
+	.her_Two_study {
+		overflow-x: auto !important;
+		display: flex;
+		white-space: nowrap;
+	}
 	.style_five_label{
 		float:left;
 		padding: 0px 5px;

pages/cart/cart.vue

@@ -9,13 +9,12 @@
       ">
 			<Text class="grid-text" v-if='IsEducation!=1'>商品库存有限，请尽快下单哦</Text>
 			<Text class="grid-text"
-				v-if='IsEducation==1'>共{{list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
-			<Text @click="edit" v-if="editType == false && list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
+				v-if='IsEducation==1'>共{{list[0]&&list[0].GoodsList&&list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
+			<Text @click="edit" v-if="editType == false && list[0]&&list[0].GoodsList&&list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
 			<Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text>
 		</view>
 		<view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view>
 		<u-empty v-if="emptyshow == true" text="购物车还是空的哦" mode="car"></u-empty>
-
 		<view v-if="list.length > 0"
 			style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;">
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
@@ -77,7 +76,7 @@
 												<view class="The-title">
 													{{ item.GoodsName}}
 												</view>
-												<view v-if="item.EduData.ClassCondition.length>0" class="limit"  @touchstart="mouseover()" @touchend="mouseLeave()">
+												<view v-if="item.EduData&&item.EduData.ClassCondition&&item.EduData.ClassCondition.length>0" class="limit"  @touchstart="mouseover()" @touchend="mouseLeave()">
 													<u-icon name="lock" size="44" :color="mc" />
 													<view class="limit-box" v-show="limitShow">
 														此课程有报名限制，请点击详情查看
@@ -113,7 +112,7 @@
 									<!-- <Text v-if='u.TenantId==27&&item.EduData.ClassTime' style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
 										上课时间:{{item.EduData.ClassTime}}
 									</Text> -->
-									<view v-if="item.EduData.ClassTimeList.length>0&&u.TenantId==27"
+									<view v-if="item.EduData&&item.EduData.ClassTimeList&&item.EduData.ClassTimeList.length>0&&u.TenantId==27"
 										style="color: #a0a09d;font-size: 22rpx;margin-right: 5rpx;">
 										<view v-if="!item.show">
 											<view style='display: flex;

pages/index/index.vue

@@ -112,7 +112,7 @@
 					<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
 				</view>
 				<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
-				<template v-show="setting&&setting.is_show_auth==1">
+				<template v-if="setting&&setting.is_show_auth==1">
 						<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 				</template>
 				<official-account></official-account>
@@ -260,6 +260,9 @@
 			let c = this.$uiConfig.is_bang ? 78 : 50;
 			this.boxpaddingbottom = c;
 			this.contentHeight = this.$utils.calcContentHeight(c);
+			if (options && options.jzTravelOpenId) {
+				uni.setStorageSync("jzTravelOpenId", options.jzTravelOpenId);
+			}
 			if (options && options.page_id) {
 				this.pageId = options.page_id;
 				let queryString = "";
@@ -440,6 +443,7 @@
 			} else {
 				that.sharejump(); //4-9新加
 				this.handleChengShuang();
+				this.SetMemberBindCustomer()
 			}
 			// #endif
 
@@ -609,6 +613,27 @@
 			}
 		},
 		methods: {
+			SetMemberBindCustomer(){
+				let that = this;
+				that.request2({
+					url: "/api/MemberUser/SetMemberBindCustomer",
+					data: {
+						Id: that.u.UserId,
+						CustomerOpenId: uni.getStorageSync('jzTravelOpenId')
+					},
+					},
+					(res) => {
+					if (res.resultCode == 1) {
+						uni.removeStorageSync('jzTravelOpenId');
+					}
+					},(err) => {
+						// uni.showToast({
+						// 	title: err.message,
+						// 	icon: "none",
+						// });
+					}
+				);
+			},
 			getunilogin(res) {
 				let that = this;
 				//静默登录操作

pages/order-submit/order-submit.vue

@@ -222,7 +222,17 @@
 				<text class="bold">{{ ds.total_price }}</text>
 			</view>
 			<view class="right">
-				<u-button :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="ds.promptNoSuperiorFY== true ? submitModel():submitOrderHandler()"
+				<u-button v-if="ds.promptNoSuperiorFY== true" :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="submitModel()"
+				 :custom-style="{
+						backgroundColor: mc,
+						height: '80rpx',
+						color: '#FFF',
+						fontSize: '14px'
+					}">
+					<u-loading mode="circle" style="margin-right: 5px;" v-if="submitOrder"></u-loading>
+					{{btntext}}
+				</u-button>
+				<u-button v-else :disabled="!address_enable" size="80" :ripple="true" shape="circle" @click="submitOrderHandler()"
 				 :custom-style="{
 						backgroundColor: mc,
 						height: '80rpx',
@@ -554,7 +564,7 @@
 												that.payInfo.total_price = that.ds.total_price;
 											}
 											
-											if (that.formdata.Use_Deposit_Id != 0 && that.ds.total_price == 0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
+											if ((that.formdata.Use_Deposit_Id != 0 || that.formdata.use_integral != 0) && that.ds.total_price == 0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
 												uni.reLaunch({
 													url: '/pages/order-submit/pay-success?payInfo=' + JSON.stringify(that.payInfo)
 												})

pages/order/order-detail.vue

@@ -162,6 +162,10 @@
 						<view class="label">佣金抵扣</view>
 						<view class="content right">-￥{{ orders.DeductionCommission }}</view>
 					</view>
+					<view class="field" v-if="orders.IntegralMoney>0">
+						<view class="label">积分抵扣</view>
+						<view class="content right">-￥{{ orders.IntegralMoney }}</view>
+					</view>
 					<view style="width: 100%;height: 1px;background: #f5f5f5;margin: 5px 0;"></view>
 					<view class="field">
 						<view class="label">&nbsp;</view>