集客修改

pages/activity/jkDetail.vue

@@ -98,7 +98,7 @@
 				</button> -->
 				<!-- 状态1未开始 2进行中3已结束 -->
 				<view class="bottomBtn" v-if="info.state==2" @click="signUp" :style="{background:'#'+themeColor}">
-				  <span v-if="info.money">￥{{info.money}} &nbsp; 立即抢购</span>
+				  <span v-if="info.payType==1">￥{{info.money}} &nbsp; 立即抢购</span>
 				  <span v-else>立即报名</span>
 				</view>
 				<view class="bottomBtn2" v-if="info.state==1">报名未开始</view>
@@ -135,7 +135,7 @@
 				<view class="bmTtnBox">
 					<view style="height: 1rpx;"></view>
 					<view class="bmBtn" @click="submitOrder" :style="{background:'#'+themeColor}">
-						<span v-if="info.money">￥{{info.money}} &nbsp; 立即抢购</span>
+						<span v-if="info.payType==1">￥{{info.money}} &nbsp; 立即抢购</span>
 						<span v-else>立即报名</span>
 					</view>
 				</view>

pages/shop/wp.vue

@@ -24,7 +24,7 @@
 				mpWxQr: "https://apidms.66km.com/static/third/jialian.ico",
 				canvasW: 0,
 				canvasH: 0,
-				invest_areas: [{id: 1, name: "儿童教育"}, {id: 1, name: "少儿编程"}, {id: 1, name: "生物智能"}, {id: 1, name: "万物相连"}, {id: 1, name: "大数据"}],
+				invest_areas: [{id: 1, name: "儿童教育"}, {id: 1, name: "大数据"}],
 				nickname: "",
 				avatar: "",
 				company: "",
@@ -55,11 +55,11 @@
 		onLoad(opt) {
 			//this.canvasW = uni.getSystemInfoSync().windowWidth
 			//this.canvasH = this.calculateCanvasHeight()
-			
 			this.avatar=opt.img;
-			this.nickname=opt.name;
+			this.avatar=this.avatar.replace('http','https');
+			console.log(this.avatar)
+			this.nickname=opt.name;	
 			if(opt.sellingPoint&&opt.sellingPoint!='undefined'){
-				
 				this.sellingPoint=opt.sellingPoint;
 			}
 			console.log('this.sellingPoint==='+this.sellingPoint)

pages/user/myOrder/activityOrderDetail.vue

@@ -69,7 +69,7 @@
 						<image src="../../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
 					</view>
 				</view>
-				<view class="salePrice"><span class="informationNum">￥</span>{{item.salePrice}}</view>
+				<view class="salePrice"><span class="informationNum">￥</span>{{orderData.data.payType==1? item.salePrice:0}}</view>
 			</view>
 			
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
@@ -103,7 +103,7 @@
 		<!-- 实付款 -->
 		<view class="money">
 			<view class="informationNum">实付款：</view>
-			<view class="informationNum" style="color: #FF0000;font-weight: bold;">￥{{orderData.data.realMoney}}</view>
+			<view class="informationNum" style="color: #FF0000;font-weight: bold;">￥{{orderData.data.payType==1?orderData.data.realMoney:0}}</view>
 		</view>
 
 		<!-- 订单信息 -->

pages/user/myOrder/myOrder.vue

@@ -26,7 +26,7 @@
 				</view>
 				<view class="itemShopBg">
 					<view class="shopName">{{item.SheetContent}}</view>
-					<view style="color: #333333;font-size: 22rpx;">￥<span class="price">{{item.RealMoney}}</span></view>
+					<view style="color: #333333;font-size: 22rpx;">￥<span class="price">{{item.payType==1?item.realMoney:0}}</span></view>
 				</view>
 
 				<view class="itemName">{{item.CreateTime}}</view>