Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

template/admin/src/layout/navBars/breadcrumb/userNews.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="content-box">
       <template v-if="newsList.length > 0">
-        <div class="content-box-item" v-for="(v, k) in newsList" :key="k">
+        <div class="content-box-item" v-for="(v, k) in newsList" :key="k" @click="jumpUrl(v.url)">
           <div>{{ v.type | msgType }}</div>
           <div class="content-box-msg">
             {{ v.title }}
@@ -137,10 +137,10 @@ export default {
           typeName = '库存报警';
           break;
         case 3:
-          typeName = '库存报警';
+          typeName = '评论回复';
           break;
         case 4:
-          typeName = '库存报警';
+          typeName = '提现申请';
           break;
         default:
           typeName = '其它';
@@ -194,6 +194,7 @@ export default {
     font-size: 13px;
     .content-box-item {
       padding-top: 12px;
+      cursor: pointer;
       &:last-of-type {
         padding-bottom: 12px;
       }

template/admin/src/pages/kefu/appChat/index.vue

@@ -49,7 +49,10 @@
                           </div>
                           <div class="attr">
                             <span>库存：{{ item.productInfo.stock }}</span>
-                            <span>销量：{{ item.productInfo.sales }}</span>
+                            <span>销量：{{
+                                parseInt(item.productInfo.sales) +
+                                parseInt(item.productInfo.ficti ? item.productInfo.ficti : 0)
+                              }}</span>
                           </div>
                           <div class="group">
                             <div class="money">￥{{ item.productInfo.price }}</div>

template/admin/src/pages/kefu/pc/index.vue

@@ -52,10 +52,7 @@
                               {{ item.productInfo.store_name }}
                             </div>
                             <div class="sku">
-                              库存：{{ item.productInfo.stock }} 销量：{{
-                                parseInt(item.productInfo.sales) +
-                                parseInt(item.productInfo.ficti ? item.productInfo.ficti : 0)
-                              }}
+                              库存：{{ item.productInfo.stock }} 销量：{{ item.productInfo.sales }}
                             </div>
                             <div class="price-box">
                               <div class="num">¥ {{ item.productInfo.price }}</div>

template/admin/src/pages/order/invoice/index.vue

@@ -211,7 +211,7 @@
             </Row>
             <Row class="row">
               <Col span="12">企业地址: {{ invoiceDetails.address }}</Col>
-              <Col span="12">企业电话: {{ invoiceDetails.drawer_phone }}</Col>
+              <Col span="12">企业电话: {{ invoiceDetails.tell }}</Col>
             </Row>
           </div>
           <div class="list">

template/admin/src/pages/order/orderList/handle/orderDetails.vue

@@ -175,7 +175,7 @@
             </Row>
             <Row class="mb10">
               <Col span="12">企业地址: {{ orderDatalist.orderInfo.invoice.address }}</Col>
-              <Col span="12">企业电话: {{ orderDatalist.orderInfo.invoice.drawer_phone }}</Col>
+              <Col span="12">企业电话: {{ orderDatalist.orderInfo.invoice.tell }}</Col>
             </Row>
           </div>
           <Row class="mb10" v-if="orderDatalist.orderInfo.invoice.is_invoice">

template/admin/src/pages/product/components/addReply.vue

@@ -12,6 +12,7 @@
           <img v-if="attr.image" :src="attr.image" class="image" />
           <Icon v-else type="ios-add" />
         </div>
+        <div>{{ attr.suk }}</div>
       </FormItem>
       <FormItem label="用户头像">
         <div class="upload-box" @click="callPicture('单选')">

template/uni-app/components/recommend/index.vue

@@ -129,6 +129,8 @@
 		color: #282828;
 		margin-top: 20rpx;
 		padding: 0 10rpx;
+		line-height: 34rpx;
+		height: 68rpx;
 	}
 
 	.recommend .recommendList .item .money {
@@ -142,7 +144,7 @@
 		color: #282828;
 		font-weight: bold;
 		display: flex;
-		align-items: center;
+		align-items: center;
 		padding: 0rpx 0 0 10rpx;
 
 		image {

template/uni-app/pages/activity/goods_combination_status/index.vue

@@ -847,7 +847,8 @@
 
 	.group-con .wrapper .list .pictrue .dumpling {
 		width: 72rpx;
-		height: 32rpx;
+		height: 32rpx;
+		line-height: 32rpx;
 		font-size: 18rpx;
 		text-align: center;
 		color: #fff;

template/uni-app/pages/goods/order_details/index.vue

@@ -176,10 +176,10 @@
 				</button>
 			</div>
 			<!-- #endif -->
-			<view class='wrapper'>
+			<view class='wrapper' v-if="isReturen == 1">
 				<view class='item acea-row row-between'>
 					<view>{{$t(`申请理由`)}}：</view>
-					<view class='conter'>{{(orderInfo.add_time_y || '') +' '+(orderInfo.add_time_h || 0)}}</view>
+					<view class='conter'>{{orderInfo.refund_explain}}</view>
 				</view>
 				<view class='item acea-row row-between'>
 					<view>{{$t(`申请图片`)}}：</view>

template/uni-app/pages/goods_details/index.vue

@@ -610,6 +610,7 @@
 						this.getCouponList();
 						this.getCartCount();
 						this.downloadFilePromotionCode();
+						// this.ShareInfo();
 					}
 				},
 				deep: true,
@@ -1122,18 +1123,19 @@
 						that.$set(that, "navList", navList);
 						that.$set(that, "storeImage", that.storeInfo.image);
 						that.$set(that, "svip_price_open", res.data.svip_price_open);
-						// #ifdef H5
-						if (that.isLogin) {
-							that.ShareInfo();
-						}
-						// #endif
 						if (that.isLogin) {
 							that.getUserInfo();
 						}
 						// #ifdef H5 || APP-PLUS
 						this.getImageBase64();
 						// #endif
+						// #ifdef H5
+						if (that.isLogin) {
+							that.ShareInfo();
+						}
+						// #endif
 						this.$nextTick(() => {
+
 							if (good_list.length) {
 								// #ifndef APP-PLUS
 								that.setClientHeight();
@@ -1563,7 +1565,8 @@
 						return
 					}
 					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
+					if (this.$wechat.isWeixin()) {
+						// this.ShareInfo()
 						this.weixinStatus = true;
 					}
 					this.downloadFilePromotionCode();

template/uni-app/pages/index/diy/components/goodList.vue

@@ -51,7 +51,7 @@
 							<image :src="item.image" mode="aspectFit">
 						</view>
 						<view class="text-info">
-							<view class="title line1" v-if="titleShow">{{ item.store_name }}</view>
+							<view class="title line2" v-if="titleShow">{{ item.store_name }}</view>
 							<view class="old-price" v-if="opriceShow">
 								{{$t(`￥`)}}{{ item.ot_price }}
 							</view>
@@ -84,7 +84,7 @@
 						<view class="text-info"
 							style="display: flex; flex-direction: column; justify-content: space-between;">
 							<view>
-								<view class="title line1" v-if="titleShow">{{ item.store_name }}</view>
+								<view class="title line2" v-if="titleShow">{{ item.store_name }}</view>
 								<view class="old-price" v-if="opriceShow">
 									{{$t(`￥`)}}{{ item.ot_price }}
 								</view>
@@ -313,6 +313,8 @@
 
 					.title {
 						color: #222222;
+						line-height: 34rpx;
+						height: 68rpx;
 					}
 
 					.old-price {

template/uni-app/pages/index/diy/components/promotionList.vue

@@ -26,7 +26,7 @@
 					<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
 				</view>
 				<view class="text-info">
-					<view class="title line1" v-if="titleShow">{{item.store_name}}</view>
+					<view class="title line2" v-if="titleShow">{{item.store_name}}</view>
 					<view class="old-price" v-if="opriceShow">{{$t(`￥`)}}{{item.ot_price}}</view>
 					<view class="price" :style="{color:fontColor}">
 						<view v-if="priceShow">
@@ -174,7 +174,9 @@
 					padding: 10rpx 20rpx 15rpx;
 
 					.title {
-						color: #222222;
+						color: #222222;
+						line-height: 34rpx;
+						height: 68rpx;
 					}
 
 					.old-price {

template/uni-app/pages/users/user_goods_collection/index.vue

@@ -197,7 +197,7 @@
 					})
 				} else {
 					this.$util.Tips({
-						title: that.$t(`该商品已下架`)
+						title: this.$t(`该商品已下架`)
 					})
 				}
 

template/uni-app/pages/users/user_spread_money/index.vue

@@ -25,7 +25,7 @@
 											<view class="fail-msg" v-if="child.fail_msg">
 												{{$t(`原因`)}}：{{child.fail_msg}}
 											</view>
-											<view class="fail-msg" v-else>
+											<view class="fail-msg" v-else-if="child.extract_type">
 												{{$t(`提现方式`)}}：{{child.extract_type}}
 											</view>
 										</view>