提交

pages/admin/goods_details/index.vue

@@ -4,14 +4,17 @@
       <scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true" :style='"height:"+height+"px;"'
         @scroll="scroll">
         <view id="past0">
-					<productConSwiper :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg" :videoline="storeInfo.video_link"></productConSwiper>
+          <productConSwiper :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg"
+            :videoline="storeInfo.video_link"></productConSwiper>
           <!--秒杀-->
           <view v-if="storeInfo.product_type == 1" class='nav acea-row row-between-wrapper'>
-						<view class='money'>￥<text class='num'>{{storeInfo.price}}</text><text class='y-money'>￥{{storeInfo.ot_price}}</text></view>
+            <view class='money'>￥<text class='num'>{{storeInfo.price}}</text><text
+                class='y-money'>￥{{storeInfo.ot_price}}</text></view>
             <view class='acea-row row-middle'>
               <view class='time'>
                 <view>距秒杀结束仅剩</view>
-								<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '" :second-text="' '" :datatime="datatime"></countDown>
+                <countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '"
+                  :second-text="' '" :datatime="datatime"></countDown>
               </view>
             </view>
           </view>
@@ -30,9 +33,11 @@
               <view style="margin-left: 30rpx;">已预定:0{{ storeInfo.unit_name }}</view>
             </view>
             <view class='introduce line2'>
-							<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
+              <text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
+                class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
               <text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text>
-							{{storeInfo.store_name}}</view>
+              {{storeInfo.store_name}}
+            </view>
             <view class="presell_count">
               <view>
                 <view>预售活动时间：</view>
@@ -66,21 +71,24 @@
             <view class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
               <view class='money '>
                 <text class="font-color">￥<text class='num'>{{storeInfo.price}}</text></text>
-								<text class="font-gray orig_price">￥<text class='num' style="font-size: 28rpx;">{{storeInfo.ot_price}}</text></text>
+                <text class="font-gray orig_price">￥<text class='num'
+                    style="font-size: 28rpx;">{{storeInfo.ot_price}}</text></text>
               </view>
 
               <view class='iconfont icon-fenxiang' v-if="comForm != 'admin'"></view>
             </view>
 
             <view class='introduce line2'>
-							<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
+              <text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
+                class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
               <text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text>
               {{storeInfo.store_name}}
             </view>
             <view class='label acea-row row-between-wrapper'>
               <view>类型:{{storeInfo.buying_count_num ? storeInfo.buying_count_num : 0}}人团</view>
               <view>库存:{{storeInfo.stock ? storeInfo.stock : 0}}</view>
-							<view>已拼:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
+              <view>已拼:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
+              </view>
             </view>
 
           </view>
@@ -92,8 +100,8 @@
                   class='line'>|</text>
               </view>
               <view class='swiper'>
-								<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500" duration="500" vertical="true"
+                <swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500" duration="500"
-								 circular="true">
+                  vertical="true" circular="true">
                   <block v-for="(item,index) in itemNew" :key='index'>
                     <swiper-item>
                       <view class='line1'>{{item.nickname ? item.nickname : ''}}拼团成功</view>
@@ -103,7 +111,8 @@
               </view>
             </view>
             <view class='assemble' v-if="pink.length" :style="itemNew.length ? '' : 'margin-top: 20rpx;'">
-							<view class='item acea-row row-between-wrapper' v-for='(item,index) in pink' :key='index' v-if="index < AllIndex && pink.length>0">
+              <view class='item acea-row row-between-wrapper' v-for='(item,index) in pink' :key='index'
+                v-if="index < AllIndex && pink.length>0">
                 <view class='pictxt acea-row row-between-wrapper'>
                   <view class='pictrue'>
                     <image :src='item.initiator.avatar ? item.initiator.avatar : "/static/images/f.png"'></image>
@@ -112,22 +121,26 @@
                 </view>
                 <view class='right acea-row row-middle'>
                   <view>
-										<view class='lack'>还差<text class='font-color'>{{item.buying_count_num - item.yet_buying_num}}</text>人成团</view>
+                    <view class='lack'>还差<text
+                        class='font-color'>{{item.buying_count_num - item.yet_buying_num}}</text>人成团</view>
                     <view class='time'>
                       剩余
-											<count-down :justifyLeft="justifyLeft" :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="':'"
+                      <count-down :justifyLeft="justifyLeft" :is-day="false" :tip-text="' '" :day-text="' '"
-											 :minute-text="':'" :second-text="' '" :datatime="item.end_time"></count-down>
+                        :hour-text="':'" :minute-text="':'" :second-text="' '" :datatime="item.end_time"></count-down>
                     </view>
                   </view>
-									<navigator hover-class='none' :url="'/pages/activity/combination_status/index?id='+item.group_buying_id" class='spellBnt'>
+                  <navigator hover-class='none'
+                    :url="'/pages/activity/combination_status/index?id='+item.group_buying_id" class='spellBnt'>
                     去拼单
                     <text class='iconfont icon-jiantou'></text>
                   </navigator>
                 </view>
               </view>
               <template v-if="pink.length">
-								<view class='more' @tap='showAll' v-if="pink.length > AllIndex">查看更多<text class='iconfont icon-xiangxia'></text></view>
+                <view class='more' @tap='showAll' v-if="pink.length > AllIndex">查看更多<text
-								<view class='more' @tap='hideAll' v-else-if="pink.length === AllIndex && pink.length !== AllIndexDefault">收起<text
+                    class='iconfont icon-xiangxia'></text></view>
+                <view class='more' @tap='hideAll'
+                  v-else-if="pink.length === AllIndex && pink.length !== AllIndexDefault">收起<text
                     class='iconfont icon-xiangshang'></text></view>
               </template>
             </view>
@@ -156,8 +169,10 @@
               </view>
             </view>
           </view>
-					<view v-if="storeInfo.product_type == 0 || storeInfo.product_type == 3 || storeInfo.product_type == 1" class='wrapper'>
+          <view v-if="storeInfo.product_type == 0 || storeInfo.product_type == 3 || storeInfo.product_type == 1"
-						<view v-if="storeInfo.product_type != 1" class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
+            class='wrapper'>
+            <view v-if="storeInfo.product_type != 1" class='share acea-row row-between row-bottom'
+              style="padding: 0;margin: 0;">
               <view class='money font-color'>
                 ￥
                 <text class='num'>{{storeInfo.price}}</text>
@@ -166,12 +181,15 @@
             </view>
             <view class='introduce line2'>
               <text v-if="storeInfo.merchant.type_name" class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
-							<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red bg">自营</text>{{storeInfo.store_name ? storeInfo.store_name : ''}}
+              <text v-else-if="storeInfo.merchant.is_trader"
+                class="font-bg-red bg">自营</text>{{storeInfo.store_name ? storeInfo.store_name : ''}}
             </view>
             <view class='label acea-row row-between-wrapper' style="padding-bottom: 10px">
               <view v-if="storeInfo.product_type != 3">原价:￥{{storeInfo.ot_price ? storeInfo.ot_price : ''}}</view>
-							<view>库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
+              <view>库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
-							<view>销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}</view>
+              </view>
+              <view>销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
+              </view>
             </view>
           </view>
           <view class='attribute acea-row row-between-wrapper' @click="selecAttr">
@@ -188,7 +206,8 @@
             <view class='iconfont icon-jiantou'></view>
           </view>
           <!--保障-->
-					<view v-if="guarantee && guarantee.length" class='attribute acea-row row-between-wrapper' @click="showGuaranee">
+          <view v-if="guarantee && guarantee.length" class='attribute acea-row row-between-wrapper'
+            @click="showGuaranee">
             <view class="acea-row row-between-wrapper">保障：
               <view class="guaranteeAttr">
                 <text class='atterTxt1' :class="item.guarantee_name ? 'hasAttr' : ''" v-for="(item,index) in guarantee">
@@ -220,7 +239,8 @@
               </view>
               <view class="info">
                 <view class="name">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}
-									<text v-if="storeInfo.merchant.type_name" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
+                  <text v-if="storeInfo.merchant.type_name"
+                    class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
                   <text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8">自营</text>
                 </view>
                 <view v-if="storeInfo.merchant.care_count" class="txt">
@@ -244,9 +264,11 @@
         </view>
         <view class='product-intro' id="past3">
           <view class='title'>产品介绍</view>
-					<jyf-parser v-if="description.type == 0" :domain='domain' :html="description.content.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
+          <jyf-parser v-if="description.type == 0" :domain='domain' :html="description.content.replace(/<br\/>/ig, '')"
+            ref="article" :tag-style="tagStyle"></jyf-parser>
           <view v-else class="product_content">
-						<view v-if="description.content && description.content.title" class="title">{{description.content.title}}</view>
+            <view v-if="description.content && description.content.title" class="title">{{description.content.title}}
+            </view>
             <view v-if="description.content && description.content.image" class="pictures">
               <image v-for="(item,index) in description.content.image" :key="index" :src="item"></image>
             </view>
@@ -256,8 +278,8 @@
       </scroll-view>
     </view>
     <!-- 组件 -->
-		<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
+    <productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-		 @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'></productWindow>
+      @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'></productWindow>
     <guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
   </view>
 </template>
@@ -374,7 +396,7 @@
         comForm: '' // 页面打开的途径，admin代表时后台的预览
       };
     },
-		computed: configMap(['hide_mer_status'],mapGetters(['isLogin', 'uid'])),
+    computed: configMap(['hide_mer_status'], mapGetters(['isLogin', 'uid'])),
     onLoad(options) {
       let that = this
       var pages = getCurrentPages();
@@ -399,7 +421,7 @@
     },
     onReady() {},
     onShow() {
-			this.getConfig()
+      // this.getConfig()
     },
     methods: {
       boxStatus(data) {
@@ -446,7 +468,8 @@
         this.$set(this, 'toView', id);
         this.$set(this, 'navActive', index);
         this.$set(this, 'lock', true);
-				this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[index]);
+        this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[
+          index]);
       },
       scroll: function(e) {
         var that = this,
@@ -475,7 +498,8 @@
        */
       ChangeCartNum: function(changeValue) {},
       attrVal(val) {
-				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val.indexn]);
+        this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+        .indexn]);
       },
       /**
        * 属性变动赋值
@@ -483,9 +507,10 @@
        */
       ChangeAttr: function(res) {
         let productSelect = this.productValue[res];
-				if(productSelect)this.$set(this, "uniqueValue", productSelect.unique);
+        if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
         if (productSelect && productSelect.stock > 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo.image);
+          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
+            .image);
           this.$set(this.attr.productSelect, "price", productSelect.price);
           this.$set(this.attr.productSelect, "stock", productSelect.stock);
           this.$set(this.attr.productSelect, "unique", productSelect.unique);
@@ -493,8 +518,7 @@
           this.$set(this.attr.productSelect, "cart_num", 1);
           this.$set(this, "attrValue", res);
           this.$set(this, "attrTxt", "已选择");
-				}
+        } else {
-				 else {
           this.$set(this.attr.productSelect, "image", this.storeInfo.image);
           this.$set(this.attr.productSelect, "price", 0);
           this.$set(this.attr.productSelect, "stock", 0);
@@ -523,7 +547,7 @@
           mask: true
         });
         let that = this;
-				getProductDetail({id: that.id, product_type: that.product_type}).then(res => {
+        getProductDetail({ id: that.id, product_type: that.product_type }).then(res => {
           uni.hideLoading();
           let storeInfo = res.data;
           if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
@@ -566,13 +590,13 @@
         })
       },
       /*获取预览商品详情*/
-			getPreviewDetails(){
+      getPreviewDetails() {
         uni.showLoading({
           title: '加载中',
           mask: true
         });
         let that = this;
-				let params = that.preview_key ? {key:that.preview_key} : {id: that.id, product_type: that.product_type}
+        let params = that.preview_key ? { key: that.preview_key } : { id: that.id, product_type: that.product_type }
         getPreviewProDetail(params).then(res => {
           uni.hideLoading();
           let storeInfo = res.data;
@@ -584,7 +608,7 @@
           }
           that.$set(that, 'storeInfo', storeInfo);
           that.$set(that, 'description', storeInfo.content);
-					that.$set(that.description, 'type', storeInfo.content.type || 0 );
+          that.$set(that.description, 'type', storeInfo.content.type || 0);
           that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
           that.$set(that.attr, 'productAttr', res.data.attr);
           that.$set(that, 'productValue', res.data.sku);
@@ -661,7 +685,8 @@
             "store_name",
             this.storeInfo.store_name
           );
-					this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo.image);
+          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
+            .image);
           this.$set(this.attr.productSelect, "price", productSelect.price);
           this.$set(this.attr.productSelect, "stock", productSelect.stock);
           this.$set(this.attr.productSelect, "unique", productSelect.unique);
@@ -746,22 +771,27 @@
     position: relative;
     top: -8rpx;
   }
+
   .product-con .presell_count {
     margin-top: 20rpx;
     font-size: 26rpx;
     color: #999999;
+
     .presell_time {
       margin: 8rpx 0 4rpx;
+
       .area_line {
         display: inline-block;
         margin: 0 6rpx;
       }
     }
+
     .icon-shijian1 {
       display: inline-block;
       margin-right: 4rpx;
     }
   }
+
   .product-con .presell_process {
     margin-top: 20rpx;
     height: 110rpx;
@@ -773,17 +803,20 @@
       top: 24rpx;
       left: 40rpx;
     }
+
     .process_line {
       width: 414rpx;
       height: 2rpx;
       background: #CCCCCC;
     }
+
     .text_line {
       display: inline-block;
       width: 25%;
       color: #CCCCCC;
       margin-top: 6rpx;
       position: relative;
+
       &::after {
         content: "";
         display: inline-block;
@@ -794,29 +827,37 @@
         position: absolute;
         top: -14rpx;
       }
+
       &.text_line1 {
         text-align: left;
         color: #E93323;
+
         &::after {
           background: #E93323;
           left: 0;
         }
+
         text {
           margin-left: -20rpx
         }
       }
+
       &.text_line3 {
         text-align: right;
+
         &::after {
           right: 0;
         }
+
         text {
           margin-right: -20rpx
         }
       }
+
       &.text_line2 {
         width: 50%;
         text-align: center;
+
         &::after {
           left: 50%;
           margin-left: -4rpx;
@@ -824,6 +865,7 @@
       }
     }
   }
+
   /*拼团*/
   .product-con .notice {
     width: 100%;
@@ -832,18 +874,22 @@
     padding: 0 30rpx;
     box-sizing: border-box;
   }
+
   .product-con .notice .num {
     font-size: 24rpx;
   }
+
   .product-con .notice .num .iconfont {
     font-size: 30rpx;
     vertical-align: -3rpx;
     margin-right: 20rpx;
   }
+
   .product-con .notice .num .line {
     color: #282828;
     margin-left: 15rpx;
   }
+
   .product-con .notice .swiper {
     height: 100%;
     width: 360rpx;
@@ -851,6 +897,7 @@
     overflow: hidden;
     margin-left: 14rpx;
   }
+
   .product-con .notice .swiper swiper {
     height: 100%;
     width: 100%;
@@ -858,6 +905,7 @@
     font-size: 24rpx;
     color: #282828;
   }
+
   .product-con .playWay {
     background-color: #fff;
     padding: 0 30rpx;
@@ -865,25 +913,30 @@
     font-size: 28rpx;
     color: #282828;
   }
+
   .product-con .playWay .title {
     height: 86rpx;
     border-bottom: 1px solid #eee;
   }
+
   .product-con .playWay .title .iconfont {
     margin-left: 13rpx;
     font-size: 28rpx;
     color: #717171;
   }
+
   .product-con .playWay .way {
     min-height: 110rpx;
     font-size: 26rpx;
     color: #282828;
   }
+
   .product-con .playWay .way .iconfont {
     color: #cdcdcd;
     font-size: 40rpx;
     margin: 0 35rpx;
   }
+
   .product-con .playWay .way .item .num {
     font-size: 34rpx;
     margin-right: 6rpx;
@@ -892,15 +945,18 @@
     display: inline-block;
     vertical-align: middle;
   }
+
   .product-con .playWay .way .item .tip {
     font-size: 22rpx;
     color: #a5a5a5;
     margin-top: -4rpx;
   }
+
   .product-con .playWay .way .way_text {
     position: relative;
     top: 4rpx;
   }
+
   .activity_pin {
     width: auto;
     height: 44rpx;
@@ -911,6 +967,7 @@
     padding: 0 15rpx;
     margin-left: 19rpx;
   }
+
   .activity_miao {
     width: auto;
     height: 44rpx;
@@ -921,14 +978,17 @@
     border-radius: 22rpx;
     margin-left: 19rpx;
   }
+
   .iconfonts {
     color: #fff !important;
     font-size: 28rpx;
   }
+
   .activity_title {
     font-size: 24rpx;
     color: #fff;
   }
+
   .activity_kan {
     width: auto;
     height: 44rpx;
@@ -939,12 +999,15 @@
     border-radius: 22rpx;
     margin-left: 19rpx;
   }
+
   .mask {
     z-index: 300 !important;
   }
+
   .head-bar {
     background: #fff;
   }
+
   .generate-posters {
     width: 100%;
     height: 170rpx;
@@ -957,24 +1020,30 @@
     transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
     border-top: 1px solid #eee;
   }
+
   .generate-posters.on {
     transform: translate3d(0, 0, 0);
   }
+
   .generate-posters .item {
     flex: 50%;
     text-align: center;
     font-size: 30rpx;
   }
+
   .generate-posters .item .iconfont {
     font-size: 80rpx;
     color: #5eae72;
   }
+
   .generate-posters .item .iconfont.icon-haibao {
     color: #5391f1;
   }
+
   .product-con .mask {
     z-index: 88;
   }
+
   .product-con .footer {
     padding: 0 20rpx 0 30rpx;
     position: fixed;
@@ -987,10 +1056,12 @@
     z-index: 277;
     border-top: 1px solid #f0f0f0;
   }
+
   .product-con .footer .item {
     font-size: 18rpx;
     color: #666;
   }
+
   .product-con .attribute .atterTxt {
     overflow: hidden;
     white-space: nowrap;
@@ -998,10 +1069,12 @@
     display: inline-block;
     width: 400rpx;
   }
-	.product-con .attribute .atterTxt1{
+
+  .product-con .attribute .atterTxt1 {
     color: #282828;
-		&.hasAttr{
+
-			&:after{
+    &.hasAttr {
+      &:after {
         content: "";
         display: inline-block;
         position: relative;
@@ -1012,39 +1085,50 @@
         background-color: #282828;
         border-radius: 100%;
       }
-			&:last-child{
+
-				&:after{
+      &:last-child {
+        &:after {
           display: none;
         }
       }
     }
   }
+
   .product-intro .title {
     font-size: 30rpx;
     color: #282828;
     text-align: center;
   }
-	.product-intro .pictures,.product-intro .pictures uni-image,
+
-	.product-intro .pictures image{
+  .product-intro .pictures,
+  .product-intro .pictures uni-image,
+  .product-intro .pictures image {
     width: 100%;
   }
-	.product-con .guaranteeAttr{
+
+  .product-con .guaranteeAttr {
     display: inline-block;
     width: 560rpx;
-		overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
+
   .product-con .superior {
     background-color: #fff;
     margin-top: 20rpx;
     padding-bottom: 10rpx;
   }
+
   .product-con .superior .title {
     height: 98rpx;
   }
+
   .product-con .superior .title image {
     width: 30rpx;
     height: 30rpx;
   }
+
   .product-con .superior .title .titleTxt {
     margin: 0 20rpx;
     font-size: 30rpx;
@@ -1052,64 +1136,79 @@
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
   }
+
   .product-con .superior .slider-banner {
     width: 690rpx;
     margin: 0 auto;
     position: relative;
   }
+
   .product-con .superior .slider-banner swiper {
     height: 100%;
     width: 100%;
   }
+
   .product-con .superior .slider-banner swiper-item {
     height: 100%;
   }
+
   .product-con .superior .slider-banner .list {
     width: 100%;
   }
+
   .product-con .superior .slider-banner .list .item {
     width: 215rpx;
     margin: 0 22rpx 30rpx 0;
     font-size: 26rpx;
   }
+
   .product-con .superior .slider-banner .list .item:nth-of-type(3n) {
     margin-right: 0;
   }
+
   .product-con .superior .slider-banner .list .item .pictrue {
     position: relative;
     width: 100%;
     height: 215rpx;
   }
+
   .product-con .superior .slider-banner .list .item .pictrue image {
     width: 100%;
     height: 100%;
     border-radius: 6rpx;
   }
+
   .product-con .superior .slider-banner .list .item .name {
     color: #282828;
     margin-top: 12rpx;
   }
+
   .product-con .superior .slider-banner .swiper-pagination-bullet {
     background-color: #999;
   }
+
   .product-con .superior .slider-banner .swiper-pagination-bullet-active {
     background-color: #e93323;
   }
+
   button {
     padding: 0;
     margin: 0;
     line-height: normal;
     background-color: #fff;
   }
+
   button::after {
     border: 0;
   }
+
   action-sheet-item {
     padding: 0;
     height: 240rpx;
     align-items: center;
     display: flex;
   }
+
   .contact {
     font-size: 16px;
     width: 50%;
@@ -1119,9 +1218,11 @@
     margin: 0;
     line-height: 2;
   }
+
   .contact::after {
     border: none;
   }
+
   .action-sheet {
     font-size: 17px;
     line-height: 1.8;
@@ -1131,11 +1232,13 @@
     right: 0;
     padding: 25rpx 0;
   }
+
   .canvas {
     z-index: 300;
     width: 750px;
     height: 1190px;
   }
+
   .poster-pop {
     width: 450rpx;
     height: 714rpx;
@@ -1146,11 +1249,13 @@
     top: 50%;
     margin-top: -357rpx;
   }
+
   .poster-pop image {
     width: 100%;
     height: 100%;
     display: block;
   }
+
   .poster-pop .close {
     width: 46rpx;
     height: 75rpx;
@@ -1159,6 +1264,7 @@
     top: -73rpx;
     display: block;
   }
+
   .poster-pop .save-poster {
     background-color: #df2d0a;
     font-size: ：22rpx;
@@ -1168,12 +1274,14 @@
     line-height: 76rpx;
     width: 100%;
   }
+
   .poster-pop .keep {
     color: #fff;
     text-align: center;
     font-size: 25rpx;
     margin-top: 10rpx;
   }
+
   .mask {
     position: fixed;
     top: 0;
@@ -1183,11 +1291,13 @@
     background-color: rgba(0, 0, 0, 0.6);
     z-index: 9;
   }
+
   .product-con .wrapper {
     padding: 32rpx;
     width: 100%;
     box-sizing: border-box;
   }
+
   .product-con .nav {
     background-image: url('data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QN/aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzE0MiA3OS4xNjA5MjQsIDIwMTcvMDcvMTMtMDE6MDY6MzkgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6NDNlZTU0ZDMtNjEwZS03ZjQ4LWEwODgtNTZlMTZiNzI3NTQwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjI1NEI2MDUyM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjI1NEI2MDUxM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjUyMDIzNWNmLTIwNGYtOTQ0My05YTBiLWNmMmZlMTJmMDk3NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0M2VlNTRkMy02MTBlLTdmNDgtYTA4OC01NmUxNmI3Mjc1NDAiLz4gPC9yZGY6RGVzY3JpcHRpb24+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');
     background-repeat: no-repeat;
@@ -1410,10 +1520,14 @@
 
       .img-box {
         display: flex;
+
         .img-item {
           width: 206rpx;
           margin-right: 20rpx;
-					/deep/image,/deep/uni-image,/deep/.easy-loadimage {
+
+          /deep/image,
+          /deep/uni-image,
+          /deep/.easy-loadimage {
             width: 206rpx;
             height: 206rpx;
             border-radius: 16rpx;

pages/gather/gather.vue

@@ -4,8 +4,8 @@
     <u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
       icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
     <block v-if="isLogin">
-      <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12">
+      <!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
-        <!-- <view class="special_work com" v-if="true"> -->
+      <view class="special_work com" v-if="true">
         <view class="title">市级供应链</view>
         <view class="content">
           <view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
@@ -38,8 +38,8 @@
         </view>
       </view>
 
-      <view class="business com" v-if="userInfoData.mer_info.type_id === 10">
+      <!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 10"> -->
-        <!-- <view class="business com" v-if="true"> -->
+      <view class="business com" v-if="true">
         <view class="special_work com">
           <view class="title">我的店铺</view>
           <view class="content ">
@@ -99,8 +99,8 @@
         <!-- <gatherBusiness :userInfoData="userInfoData" /> -->
       </view>
 
-      <view class="business com" v-if="userInfoData.mer_info.type_id === 11">
+      <!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
-        <!-- <view class="business com" v-if="true"> -->
+      <view class="business com" v-if="true">
         <view class="special_work com">
           <view class="title">里海云仓</view>
           <view class="content ">
@@ -286,7 +286,7 @@
         })
       },
       navigator(url, t) {
-        if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息")
+        // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息")
         uni.navigateTo({
           url: url
         })

pages/nongKe/supply_chain/supplier.vue

@@ -72,7 +72,7 @@
                 </view>
               </view>
               <view class="pro-box" :class="'styleType'+store_street_theme">
-                <navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none"
+                <navigator :url="`/pages/goods_details/index?id=${itemn.product_id}&product_type=98`" hover-class="none"
                   class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>
                   <view class="picture">
                     <easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>