Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

pages.json

@@ -120,7 +120,7 @@
 		}, {
 			"path": "couponList",
 			"style": {
-				"navigationBarTitleText": "我的优惠卷"
+				"navigationBarTitleText": "我的优惠券"
 			}
 		}, {
 			"path": "integralList",

pages/cart/cart.vue

@@ -6,11 +6,13 @@
 		</view>
 		<view class="cart-box" :style="{bottom: manageType ? '52px' : '0px'}">
 			<view class="shop-row" v-for="(item, index1) in cartsList" :key="index1">
-				<view class="shop-info" @click="goToShop(item)">
+				<view class="shop-info">
 					<view class="iconfont" :class="item.allCheck ? 'iconqueding' : 'iconfeigouxuan'" @click="checkShop(item)"></view>
-					<view class="iconfont iconshangjia" @click=""></view>
-					<view class="shop-name" @click="">{{item.supplierName}}</view>
-					<view class="iconfont iconfangxiang" @click=""></view>
+					<view class="shop-info-right" @click="goToShop(item)">
+					    <view class="iconfont iconshangjia"></view>
+						<view class="shop-name">{{item.supplierName}}</view>
+						<view class="iconfont iconfangxiang"></view>
+					</view>
 				</view>
 				<view class="goods-list">
 					<view class="goods-row" v-for="(site, index2) in item.products" :key="index2" @click.stop="goToGoodDetails(site)">
@@ -134,10 +136,10 @@
 			},
 			//  数量减
 			numSub(item, site) {
-				if (site.buyNum > 1) {
+				// if (site.buyNum > 1) {
 					site.buyNum--
 					this.setCartNum(item, site)
-				}
+				// }
 			},
 			//  数量加
 			numAdd(item, site) {
@@ -303,7 +305,10 @@
 					display: flex;
 					align-items: center;
 					border-bottom: 1px solid #EEEEEE;
-
+                    .shop-info-right {
+						display: flex;
+						align-items: center;
+					}
 					.shop-name {
 						font-size: 15px;
 						font-family: PingFang SC;

pagesGood/goodDetails.vue

@@ -24,13 +24,13 @@
 			</view>
 			<view class="good-name">{{goodData.productName}}</view>
 			<view class="good-plant" v-if="goodData.productType == 4">时长：{{goodData.term}}天&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;面积：{{goodData.areaSize}}平米</view>
-			<view class="good-detail">{{goodData.productDescribe}}</view>
+			<view class="good-detail">{{goodData.productDescribe ? goodData.productDescribe : '暂无描述'}}</view>
 		</view>
 		<view class="good-data" v-if="goodData.productType != 2 && goodData.productType != 4">
-			<text class="good-select">选择</text>
-			<text class="good-unit">{{number}}&nbsp;{{goodData.unit}}</text>
-			<text class="iconfont iconfangxiang"></text>
-		</view>
+			<text class="good-select">商品规格</text>
+			<text class="good-unit">{{number}}&nbsp;{{goodData.unit ? goodData.unit : ''}}</text>
+<!-- 			<text class="iconfont iconfangxiang"></text>
+ -->		</view>
 		<view class="tab-box">
 			<view class="tab-col" :class="tabIndex == 1 ? 'tab-col-active' :''" @click="tabIndex = 1">产品介绍</view>
 			<view class="tab-col" :class="tabIndex == 2 ? 'tab-col-active' :''" v-if="goodData.productType != 2 && goodData.productType != 4 "

pagesMain/couponList.vue

@@ -67,7 +67,7 @@
 			return {
 				tabIndex: 0,
 				tabList: [{
-						name: '我的卷'
+						name: '我的券'
 					},
 					{
 						name: '未使用'