页面修改

components/goods/goodsku.vue

@@ -9,14 +9,14 @@
 						<text class="small">￥</text>
 						<text>{{ goodprice }}</text>
 					</view>
-					<view class="amount">{{g.form_id ==1?'余位':'库存'}}  {{ goodamount }} {{ g.unit }}</view>
+					<view class="amount">{{g.form_id ==1?'余位':'库存'}} {{ goodamount }} {{ g.unit }}</view>
 					<view class="sku">{{ skuObj ? '已选择' : '选择' }} {{ sku }}</view>
 					<view class="sku_close">
 						<u-icon name="cross" color="#9F9F9F" @click="cloGood()" size="40" />
 					</view>
 				</view>
 			</view>
-			
+
 			<scroll-view scroll-y class="sku-box">
 				<view class="sku-item" v-for="(x, i) in g.attr_groups" :key="i">
 					<view class="sku-title">{{ x.attr_group_name }}</view>
@@ -36,7 +36,7 @@
 				<text class="label">购买数量</text>
 				<u-number-box :disabled="!skuObj" v-model="gc" :min="1" :max="goodamount" @change="valChange"></u-number-box>
 			</view>
-			<view class="btn-box" v-if="g.totalStock>0&& g.status==1 && (g.form_id == -1 || g.form_id ==0)">
+			<view class="btn-box" v-if="g.totalStock>0&& g.status==1 && (g.form_id == -1 || g.form_id ==0 ||g.form_id>1)">
 				<view style="flex: 1;" v-if="optionType != 1">
 					<u-button @click="joinCar" :ripple="true" :hair-line="false" :custom-style="btn1">加入购物车</u-button>
 				</view>
@@ -44,6 +44,7 @@
 					<u-button @click="buy" :ripple="true" :hair-line="false" :custom-style="btn2">立即购买</u-button>
 				</view>
 			</view>
+			<!--教育-->
 			<view class="btn-box" v-if="g.totalStock>0&& g.status==1 && g.form_id ==1">
 				<view style="flex: 1;">
 					<u-button :ripple="true" :hair-line="false" :custom-style="btn4" @click='signup'>立即报名5</u-button>
@@ -321,7 +322,7 @@
 					});
 				}
 			},
-			signup(){//教育报名
+			signup() { //教育报名
 				let ShoppingCartIdList = [];
 				if (this.skuObj && this.skuObj.id) {
 					let good = {
@@ -499,6 +500,7 @@
 		text-decoration: line-through;
 		margin-left: 10rpx;
 	}
+
 	.goodsku {
 		position: relative;
 		padding: 10px;

manifest.json

@@ -66,7 +66,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx5349e63aea0c8529",
+        "appid" : "wx5564525562e92ddb",
         "setting" : {
             "urlCheck" : false,
             "minified" : false

pages/goods/goods.vue

@@ -177,10 +177,10 @@
 						{{ g.price_min == g.price_max ? parseFloat(g.price_min)+parseFloat(g.edu_data.BookPrice) : g.price_min + '-' + g.price_max }}
 					</text>
 					<text class="origin" v-if="g.form_id!=1&&!g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
-					  ￥{{ g.jjxkt_original_price.toFixed(2)}}
+						￥{{ g.jjxkt_original_price.toFixed(2)}}
 					</text>
 					<text class="origin" v-if="g.form_id!=1&& g.edu_data.BookPrice&& g.jjxkt_original_price && g.jjxkt_original_price > 0 && g.jjxkt_original_price>g.price">
-					  ￥{{parseFloat(g.jjxkt_original_price)+parseFloat(g.edu_data.BookPrice)}}	 
+						￥{{parseFloat(g.jjxkt_original_price)+parseFloat(g.edu_data.BookPrice)}}
 					</text>
 					<!-- <text class="numfont" v-if="g.form_id==1">
 						{{ g.price_min }}
@@ -349,7 +349,7 @@
 				<view class="content">{{ g.goods_marketing.limit }}</view>
 			</view>
 			<!-- 优惠 -->
-			<view class="goods-Discount" v-if="g.goodsPreferentialList.length>0">
+			<view class="goods-Discount" v-if="g.goodsPreferentialList&& g.goodsPreferentialList.length>0">
 				<view class="discount-left">
 					优惠
 				</view>
@@ -795,19 +795,22 @@
 						if (res.resultCode == 1) {
 							this.g = res.data.goods;
 							// 报名限制数组
-							res.data.goods.edu_data.ClassCondition.forEach(item2 => {
-								if (item2.ItemType == 1) {
-									this.ItemType1.push(item2)
-								} else if (item2.ItemType == 2) {
-									this.ItemType2.push(item2)
-								} else if (item2.ItemType == 3) {
-									this.ItemType3.push(item2)
-								} else if (item2.ItemType == 4) {
-									this.ItemType4.push(item2)
-								} else if (item2.ItemType == 5) {
-									this.ItemType5.push(item2)
-								}
-							})
+							if (res.data.goods && res.data.goods.edu_data && res.data.goods.edu_data.ClassCondition) {
+								res.data.goods.edu_data.ClassCondition.forEach(item2 => {
+									if (item2.ItemType == 1) {
+										this.ItemType1.push(item2)
+									} else if (item2.ItemType == 2) {
+										this.ItemType2.push(item2)
+									} else if (item2.ItemType == 3) {
+										this.ItemType3.push(item2)
+									} else if (item2.ItemType == 4) {
+										this.ItemType4.push(item2)
+									} else if (item2.ItemType == 5) {
+										this.ItemType5.push(item2)
+									}
+								})
+							}
+
 							// 报名限制数组结束
 							this.g.totalStock = 0;
 							this.g.attr.forEach((x) => {