更新商品编辑时价格有概率无法回显的bug

components/barcode.vue

@@ -1,16 +1,11 @@
 <template>
-    <view class="component text-center">
-        <view class="component-title">蛋黄酥</view>
-        <view class="component-code">
-            <tki-barcode
-                ref="barcode"
-                onval
-                :val="code"
-                :load-make="true"
-                :opations="barOpations"/>
-        </view>
-        <view class="example">{{code}}</view>
-        <!-- <view class="component-qr">
+  <view class="component text-center">
+    <view class="component-title">{{name}}</view>
+    <view class="component-code">
+      <tki-barcode ref="barcode" onval :val="code" :load-make="true" :opations="barOpations" />
+    </view>
+    <view class="example">{{code}}</view>
+    <!-- <view class="component-qr">
             <tki-qrcode
                 ref="qrcode"
                 onval
@@ -19,97 +14,109 @@
                 :load-make="true"
                 :show-loading="false"/>
         </view> -->
-        <!-- <view class="coupon-no-view">
+    <!-- <view class="coupon-no-view">
             <text>编号：</text>
             <text class="coupon-no">{{ code }}</text>
         </view> -->
-    </view>
+  </view>
 </template>
 
 <script>
-    import tkiBarcode from '@/components/tki-barcode/tki-barcode'
-    import tkiQrcode from '@/components/tki-qrcode/tki-qrcode'
-    
-    export default {
-        components: {
-            tkiBarcode,
-            tkiQrcode
-        },
-        data() {
-            return {
-                code: '',
-                barOpations: {
-                    height: 150,
-                    displayValue: false
-                }
-            }
-        },
-        methods: {
-            init () {
-                this.code = '0000000000000' // 生成一维码和二维码
-                // setTimeout(() => {
-                //   this.code = '0987654321' // 5 秒后刷新一维码和二维码
-                // }, 5000)
-            }
+  import tkiBarcode from '@/components/tki-barcode/tki-barcode'
+  import tkiQrcode from '@/components/tki-qrcode/tki-qrcode'
+
+  export default {
+    components: {
+      tkiBarcode,
+      tkiQrcode
+    },
+    data() {
+      return {
+        name: '',
+        code: '',
+        barOpations: {
+          height: 150,
+          displayValue: false
         }
+      }
+    },
+    methods: {
+      init(val) {
+        this.name = val.name;
+        this.code = val.code // 生成一维码和二维码
+        // setTimeout(() => {
+        //   this.code = '0987654321' // 5 秒后刷新一维码和二维码
+        // }, 5000)
+      }
     }
+  }
 </script>
 
 <style lang="scss" scoped>
-    .component {
-        border-radius: 16rpx;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-        background: #FFFFFF;
+  .component {
+    border-radius: 16rpx;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    background: #FFFFFF;
+    flex: 1;
+    margin: 32rpx;
+    padding: 64rpx 32rpx;
+
+    &-title {
+      max-height: 112rpx;
+      font-size: 40rpx;
+      font-weight: 600;
+      line-height: 56rpx;
+      overflow: hidden;
+    }
+
+    &-code {
+      height: 150rpx;
+      margin: 32rpx 32rpx 0;
+    }
+
+    &-qr {
+      height: 250rpx;
+      margin-top: 36rpx;
+    }
+
+    .coupon-no-view {
+      margin: 0 18rpx;
+      height: 76rpx;
+      border-radius: 8rpx;
+      border: 2px solid #F5F5F5;
+      display: flex;
+      align-items: center;
+      padding: 0 24rpx;
+      margin-top: 36rpx;
+
+      text {
+        font-size: 24rpx;
+        font-weight: 400;
+
+        &:first-child {
+          color: #999999;
+        }
+      }
+
+      .coupon-no {
         flex: 1;
-        margin: 32rpx;
-        padding: 64rpx 32rpx;
-        &-title {
-            max-height: 112rpx;
-            font-size: 40rpx;
-            font-weight: 600;
-            line-height: 56rpx;
-            overflow: hidden;
-        }
-        &-code {
-            height: 150rpx;
-            margin: 32rpx 32rpx 0;
-        }
-        &-qr {
-            height: 250rpx;
-            margin-top: 36rpx;
-        }
-        .coupon-no-view {
-            margin: 0 18rpx;
-            height: 76rpx;
-            border-radius: 8rpx;
-            border: 2px solid #F5F5F5;
-            display: flex;
-            align-items: center;
-            padding: 0 24rpx;
-            margin-top: 36rpx;
-            text {
-                font-size: 24rpx;
-                font-weight: 400;
-                &:first-child {
-                    color: #999999;
-                }
-            }
-            .coupon-no {
-                flex: 1;
-                text-align: left;
-            }
-        }
-    }
-    .component-title{
-      text-align: center;
-      font-size: 34rpx;
-    }
-    .example {
-      text-align: center;
-      letter-spacing: 12rpx; /* 设置字符间距 */
-      font-weight: bold;
-      font-size: 32rpx;
+        text-align: left;
+      }
     }
+  }
+
+  .component-title {
+    text-align: center;
+    font-size: 34rpx;
+  }
+
+  .example {
+    text-align: center;
+    letter-spacing: 12rpx;
+    /* 设置字符间距 */
+    font-weight: bold;
+    font-size: 32rpx;
+  }
 </style>

components/shortPopup.vue

@@ -230,7 +230,7 @@
             product_attr_unique: this.sku[this.changeSkuKey].unique,
             product_id: this.datas.product_id,
             product_type: this.datas.product_type,
-            source: this.source||13, // 13-供货采购
+            source: this.source||11, // 11-供货采购
             spread_id: "",
           }
           let that = this

main.js

@@ -18,9 +18,11 @@ import {
 import skeleton from './components/skeleton/index.vue'
 import BaseMoney from './components/BaseMoney.vue';
 import uView from '@/uni_modules/uview-ui'
+import barcode from "@/components/barcode.vue"
 Vue.use(uView)
 Vue.component('skeleton', skeleton)
 Vue.component('BaseMoney', BaseMoney)
+Vue.component('barcode', barcode)
 Vue.prototype.$util = util;
 Vue.prototype.$Cache = Cache;
 Vue.prototype.$procure_price = (item)=>{

pages/admin/orderDetail/index.vue

@@ -45,6 +45,9 @@
 								{{ item.cart_info.product.store_name }}
 							</view>
 							<view class="attr">{{ item.cart_info.product.suk }}</view>
+              <view class="attr" @click.stop="showBarCode(item.cart_info.productAttr.product)" v-if="item.cart_info.productAttr.product&&item.cart_info.productAttr.product.bar_code">
+                商品条码: {{ item.cart_info.productAttr.product.bar_code }}
+              </view>
 						</view>
 					</view>
 					<view class="money">
@@ -52,7 +55,7 @@
 						<view class="num">x{{ item.product_num }}
 							<text class="font-color refund_num" v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
 						</view>
-						<view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view>	
+						<!-- <view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view>	 -->
 					</view>
 				</view>
 			</navigator>
@@ -182,6 +185,9 @@
 		 
 		 	</view>
 		 </u-popup>
+     <view class="bar-code" v-show="showBar" @click="showBar=false">
+       <barcode ref="code"></barcode>
+     </view>
 	</view>
 </template>
 <script>
@@ -218,6 +224,7 @@
 		props: {},
 		data: function() {
 			return {
+        showBar: false,
 				order: false,
 				change: false,
 				order_id: "",
@@ -273,7 +280,13 @@
 			
 		},
 		methods: {
-			
+			showBarCode(val){
+			  this.showBar = true
+			  this.$refs['code'].init({
+			    name: val.store_name,
+			    code: val.bar_code
+			  });
+			},
 			//收件码
 			toPostagequ(item){
 				this.popUpShow = true
@@ -987,4 +1000,17 @@
 	.public-total .money {
 		color: #ff4c3c;
 	}
+  
+  .bar-code{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999999;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0,0,0,0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>

pages/admin/orderDetail/indexOther.vue

@@ -45,6 +45,9 @@
 								{{ item.cart_info.product.store_name }}
 							</view>
 							<view class="attr">{{ item.cart_info.product.suk }}</view>
+							<view class="attr" @click.stop="showBarCode(item.cart_info.productAttr.product)" v-if="item.cart_info.productAttr.product&&item.cart_info.productAttr.product.bar_code">
+                商品条码: {{ item.cart_info.productAttr.product.bar_code }}
+              </view>
 						</view>
 					</view>
 					<view class="money">
@@ -52,7 +55,7 @@
 						<view class="num">x{{ item.product_num }}
 							<text class="font-color refund_num" v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
 						</view>
-						<view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view>	
+						<!-- <view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view>	 -->
 					</view>
 				</view>
 			</navigator>
@@ -182,6 +185,9 @@
 		 
 		 	</view>
 		 </u-popup>
+     <view class="bar-code" v-show="showBar" @click="showBar=false">
+       <barcode ref="code"></barcode>
+     </view>
 	</view>
 </template>
 <script>
@@ -219,6 +225,7 @@
 		props: {},
 		data: function() {
 			return {
+        showBar: false,
 				order: false,
 				change: false,
 				order_id: "",
@@ -274,7 +281,13 @@
 			
 		},
 		methods: {
-			
+			showBarCode(val){
+			  this.showBar = true
+			  this.$refs['code'].init({
+			    name: val.store_name,
+			    code: val.bar_code
+			  });
+			},
 			//收件码
 			toPostagequ(item){
 				this.popUpShow = true
@@ -988,4 +1001,16 @@
 	.public-total .money {
 		color: #ff4c3c;
 	}
+  .bar-code{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999999;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0,0,0,0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>

pages/admin/orderList/index.vue

@@ -119,6 +119,9 @@
 									<view class="attr" v-if="val.cart_info.productAttr.sku">
 										{{ val.cart_info.productAttr.sku }}
 									</view>
+                  <view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
+                  	商品条码: {{ val.cart_info.productAttr.product.bar_code }}
+                  </view>
 								</view>
 							</view>
 							<view class="money">
@@ -214,7 +217,9 @@
 
 			</view>
 		</u-popup>
-
+<view class="bar-code" v-show="showBar" @click="showBar=false">
+      <barcode ref="code"></barcode>
+    </view>
 	</view>
 </template>
 
@@ -254,6 +259,7 @@
 		},
 		data() {
 			return {
+        showBar: false,
 				current: "",
 				change: false,
 				refundMark: false,
@@ -305,6 +311,13 @@
 				this.popUpShow = false
 
 			},
+      showBarCode(val){
+        this.showBar = true
+        this.$refs['code'].init({
+          name: val.store_name,
+          code: val.bar_code
+        });
+      },
 			//同意先货后款订单
 			tongyi(id, number) {
 				let data = {
@@ -1003,4 +1016,16 @@
 			flex: 1;
 		}
 	}
+  .bar-code{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999999;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0,0,0,0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>

pages/admin/orderList/indexOther.vue

@@ -119,7 +119,7 @@
 									<view class="attr" v-if="val.cart_info.productAttr.sku">
 										{{ val.cart_info.productAttr.sku }}
 									</view>
-                  <view class="attr" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
+                  <view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
                   	商品条码: {{ val.cart_info.productAttr.product.bar_code }}
                   </view>
 								</view>
@@ -217,7 +217,7 @@
 
 			</view>
 		</u-popup>
-    <view class="bar-code" v-show="showBar">
+    <view class="bar-code" v-show="showBar" @click="showBar=false">
       <barcode ref="code"></barcode>
     </view>
 	</view>
@@ -246,7 +246,6 @@
 		postconfirm,
 		logisticsCode
 	} from "@/api/admin";
-  import barcode from "@/components/barcode.vue"
 	import Loading from '@/components/Loading/index'
 	import PriceChange from '@/components/PriceChange/index'
 	import {
@@ -257,7 +256,6 @@
 		components: {
 			Loading,
 			PriceChange,
-      barcode
 		},
 		data() {
 			return {
@@ -304,9 +302,6 @@
       if(option.pay_time){
         this.where.pay_time = option.pay_time;
       }
-      this.$nextTick(() => {
-                  this.$refs['code'].init()
-              })
 			this.getIndex();
 		},
 		methods: {
@@ -315,6 +310,13 @@
 				this.popUpShow = false
 
 			},
+      showBarCode(val){
+        this.showBar = true
+        this.$refs['code'].init({
+          name: val.store_name,
+          code: val.bar_code
+        });
+      },
 			//同意先货后款订单
 			tongyi(id, number) {
 				let data = {

pages/nongKe/cloud_entrepot/indexb.vue

@@ -773,7 +773,7 @@
       cartFn() {
         getCartList({
           product_type: 98,
-          source: 13
+          source: 11
         }).then(res => {
           this.totalMoney = 0
           this.cartList = res.data.list
@@ -786,7 +786,7 @@
         })
         getCartCounts({
           product_type: 98,
-          source: 13
+          source: 11
         }).then(res => {
           this.goodsNum = res.data[0].count
         })

pages/nongKe/supply_chain/merchant.vue

@@ -81,7 +81,8 @@
   import {
     getStoreGoods,
     getProductDetail,
-    postCartAdd
+    postCartAdd,
+    getStoreDetail,
   } from '@/api/store.js'
   import { Toast } from '@/libs/uniApi'
   import goodsPopup from '../cpns/goodsPopup.vue'
@@ -140,6 +141,7 @@
     },
     onLoad(e) {
       this.id = e.id
+      this.initStore()
       this.getStoreGoodsList()
 
       // getStoreGoods(e.id, this.infoData).then(res => {
@@ -148,6 +150,13 @@
     },
     onShow() {},
     methods: {
+      initStore(){
+        getStoreDetail(this.id).then(res=>{
+          console.log(res);
+        }).catch(e=>{
+          console.log(e);
+        })
+      },
       async searchBtn() {
         this.infoData.page = 1
         const res = await getStoreGoods(this.id, this.infoData)

pages/nongKe/supply_chain/shopping_trolley.vue

@@ -20,7 +20,7 @@
                   <text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
                   <text v-else class="iconfont icon-xuanzhong1"></text>
                 </view>
-                <navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'" class="info">
+                <navigator :url="hide_mer_status == 0 ? '/pages/nongKe/supply_chain/merchant?id='+item.mer_id : '#'" oldurl="/pages/store/home/index?id=" class="info">
                   <text class="iconfont icon-shangjiadingdan"></text>
                   <view class="name">{{item.mer_name}}</view>
                   <text class="iconfont icon-xiangyou"></text>
@@ -680,7 +680,7 @@
       },
       getCartNum: function() {
         let that = this;
-        getCartCounts({ product_type: 98 }).then(res => {
+        getCartCounts({ product_type: 98, source: 11 }).then(res => {
           // console.log(res);
           that.cartTotalCount = res.data[0].count || 0;
         });
@@ -688,7 +688,7 @@
       // 购物车列表
       getCartList: function(isChange) {
         let that = this;
-        getCartList({ product_type: 98 }).then(res => {
+        getCartList({ product_type: 98, source: 11 }).then(res => {
           this.type_id=res.data?.list[0]?.type_id||[]
           res.data.list.forEach((item, index) => {
             item.allCheck = true

pages/nongKe/supply_chain/shopping_trolley_a.vue

@@ -20,7 +20,7 @@
                   <text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
                   <text v-else class="iconfont icon-xuanzhong1"></text>
                 </view>
-                <navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'" class="info">
+                <navigator :url="hide_mer_status == 0 ? '/pages/nongKe/supply_chain/merchant?id='+item.mer_id : '#'" class="info">
                   <text class="iconfont icon-shangjiadingdan"></text>
                   <view class="name">{{item.mer_name}}</view>
                   <text class="iconfont icon-xiangyou"></text>
@@ -680,7 +680,7 @@
       },
       getCartNum: function() {
         let that = this;
-        getCartCounts({ product_type: 98, source: 13 }).then(res => {
+        getCartCounts({ product_type: 98, source: 11 }).then(res => {
           // console.log(res);
           that.cartTotalCount = res.data[0].count || 0;
         });
@@ -688,7 +688,7 @@
       // 购物车列表
       getCartList: function(isChange) {
         let that = this;
-        getCartList({ product_type: 98, source: 13 }).then(res => {
+        getCartList({ product_type: 98, source: 11 }).then(res => {
           this.type_id=res.data?.list[0]?.type_id||[]
           res.data.list.forEach((item, index) => {
             item.allCheck = true

pages/product/addGood/addGood.vue

@@ -59,22 +59,22 @@
           </view>
         </view>
         <view class="popup_group_item" @click="selectStoreClass">
-        	<view class="popup_group_item_label">店铺分类</view>
-        	<view class="popup_group_item_value">
-        		<view class="popup_group_item_message">
-        			<span v-if="setFormData.mer_cate_name"
-        				class="popup_group_item_message_value">{{ setFormData.mer_cate_name }}</span>
-        			<span v-else>请选择店铺分类</span>
-        		</view>
-        		<view><span class="iconfont">&#xe6bd;</span></view>
-        	</view>
+          <view class="popup_group_item_label">店铺分类</view>
+          <view class="popup_group_item_value">
+            <view class="popup_group_item_message">
+              <span v-if="setFormData.mer_cate_name"
+                class="popup_group_item_message_value">{{ setFormData.mer_cate_name }}</span>
+              <span v-else>请选择店铺分类</span>
+            </view>
+            <view><span class="iconfont">&#xe6bd;</span></view>
+          </view>
         </view>
         <view class="popup_group_item">
           <view class="popup_group_item_label">商品单位</view>
           <view class="popup_group_item_value"><input v-model="setFormData.unit_name" type="text"
               placeholder="请填写商品单位" /></view>
         </view>
-        
+
 
       </view>
 
@@ -88,8 +88,8 @@
         <store-classification :classifiedData="merchantClassification" :mer_id="merId"
           @handleGetSelectArea="handleGetSelectStore" @close="merchantClose"></store-classification>
       </uni-popup>
-      
-      
+
+
 
       <!-- 规格设置 -->
       <picker mode="selector" :range="['单规格','多规格']" :value="setFormData.spec_type" @change="changeSpecType">
@@ -104,11 +104,11 @@
             </view>
           </view>
         </view>
-        <u-modal :show="showSpecType" title="温馨提示" content="切换后商品原有规格将失效,是否继续?" 
-          show-cancel-button confirm-text="继续" @confirm="changeSpecType2" @cancel="showSpecType=false"
-        ></u-modal>
+        <u-modal :show="showSpecType" title="温馨提示" content="切换后商品原有规格将失效,是否继续?" show-cancel-button confirm-text="继续"
+          @confirm="changeSpecType2" @cancel="showSpecType=false"></u-modal>
       </picker>
-      <priceComponent v-if="setFormData.spec_type==0" :datas="setFormData.attrValue[0]" ref="priceRef" :product_id="product_id" :bar_code="code" @updateCode="updateCode">
+      <priceComponent v-if="setFormData.spec_type==0" :datas="setFormData.attrValue[0]" ref="priceRef"
+        :product_id="product_id" :bar_code="code" @updateCode="updateCode">
       </priceComponent>
       <view v-else class="popup_group" style="margin-top: 0;border-top: 1rpx solid #eeeeee;">
         <view class="popup_group_item" @click="navToSpecGood()">
@@ -118,7 +118,7 @@
           </view>
         </view>
       </view>
-      
+
 
       <view class="popup_group">
         <!-- <view class="popup_group_item" @click="showMoreInfo=!showMoreInfo">
@@ -278,14 +278,14 @@
       this.showCommodity = true;;
       this.initData();
       this.initClasiffy();
-      if(this.import==1){
+      if (this.import == 1) {
         this.getOpenerEventChannel().once('importAttrValue', (e) => {
           this.attrValue = e.attrValue;
           uni.setStorageSync('attrValue', JSON.stringify(e.attrValue));
           this.attr = e.attr;
           uni.setStorageSync('attr', JSON.stringify(e.attr));
           this.setFormData = Object.assign({}, this.setFormData, e);
-          this.$nextTick(()=>{
+          this.$nextTick(() => {
             this.$refs.commodityRef?.setDatas({
               addGoodsSecoundData: {
                 is_good: this.setFormData.is_good, // 是否推荐
@@ -301,8 +301,7 @@
             })
           })
         })
-      }
-      else if(this.product_id){
+      } else if (this.product_id) {
         this.initDataEditData();
       }
     },
@@ -402,28 +401,31 @@
             item => item
             .category && item.category.cate_name).join(',') : '';
           this.setFormData.brand_name = editGoodsDetils.brand ? editGoodsDetils.brand.brand_name : '';
-          if(typeof res.data.content == 'string')res.data.content = JSON.parse(res.data.content);
+          if (res.data.content && typeof res.data.content == 'string') res.data.content = JSON.parse(res.data
+            .content);
           //向组件注入数据
-          this.$refs.commodityRef.setDatas({
-            addGoodsSecoundData: {
-              is_good: res.data.is_good, // 是否推荐
-              is_gift_bag: res.data.is_gift_bag,
-              sort: res.data.sort,
-              once_count: res.data.once_count, // 限购数量
-              video_link: res.data.video_link,
-            },
-            goodsDis: {
-              store_name: res.data.content?.title,
-              imageList: res.data.content?.image
+          this.$nextTick(() => {
+            this.$refs.commodityRef.setDatas({
+              addGoodsSecoundData: {
+                is_good: res.data.is_good, // 是否推荐
+                is_gift_bag: res.data.is_gift_bag,
+                sort: res.data.sort,
+                once_count: res.data.once_count, // 限购数量
+                video_link: res.data.video_link,
+              },
+              goodsDis: {
+                store_name: res.data.content?.title,
+                imageList: res.data.content?.image
+              }
+            })
+            // 单规格
+            if (this.setFormData.spec_type == 0) {
+              this.$refs.priceRef.setDatas(res.data.attrValue[0]);
             }
           })
-          // 单规格
-          if (this.setFormData.spec_type == 0) {
-            this.$refs.priceRef.setDatas(res.data.attrValue[0]);
-          }
           editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
           hideLoading();
-          
+
         });
       },
       //获取商户分类
@@ -432,23 +434,23 @@
       },
       initData() {
         // 获取品牌
-        categoryBrandlist(this.merId).then((res)=>{
+        categoryBrandlist(this.merId).then((res) => {
           this.brand = res.data;
-        }).catch(e=>{
+        }).catch(e => {
           console.log(e);
         });
         // 获取平台分类
-        categoryList(this.merId).then((res)=>{
+        categoryList(this.merId).then((res) => {
           res.data.forEach((item1) => {
             item1.children.forEach((item2) => {
               item2.children = null;
             })
           })
           this.platformClassificationData = res.data;
-        }).catch(e=>{
+        }).catch(e => {
           console.log(e);
         })
-        
+
       },
       // 更新商品条码
       updateCode(e) {
@@ -600,7 +602,7 @@
         // return console.log('商品规格', this.setFormData.attr);
         console.log('是否推荐', this.$refs.commodityRef.addGoodsSecoundData);
         console.log('商品详情', this.$refs.commodityRef.goodsDis, this.$refs.commodityRef.store_name);
-        if(this.setFormData.spec_type==0){
+        if (this.setFormData.spec_type == 0) {
           console.log('价格库存', this.$refs.priceRef.singleSpecification);
         }
         let postData = {
@@ -612,27 +614,27 @@
           },
           video_link: this.$refs.commodityRef.addGoodsSecoundData.video_link,
         };
-        if(this.setFormData.spec_type==0){
+        if (this.setFormData.spec_type == 0) {
           postData.attrValue = [this.$refs.priceRef.singleSpecification];
-        }else postData.attrValue = this.setFormData.attrValue;
-        postData.stock = postData.attrValue[0]?.stock||0;
-        if(!postData.store_name||postData.store_name?.trim().length<=0)return Toast('请输入商品名称');
-        if(!postData.imageList||postData.imageList?.length<2)return Toast('请上传2张以上商品图片');
-        if(!postData.cate_name||postData.cate_name?.trim().length<=0)return Toast('请选择平台分类');
-        if(!postData.unit_name||postData.unit_name?.trim().length<=0)return Toast('请输入商品单位');
+        } else postData.attrValue = this.setFormData.attrValue;
+        postData.stock = postData.attrValue[0]?.stock || 0;
+        if (!postData.store_name || postData.store_name?.trim().length <= 0) return Toast('请输入商品名称');
+        if (!postData.imageList || postData.imageList?.length < 2) return Toast('请上传2张以上商品图片');
+        if (!postData.cate_name || postData.cate_name?.trim().length <= 0) return Toast('请选择平台分类');
+        if (!postData.unit_name || postData.unit_name?.trim().length <= 0) return Toast('请输入商品单位');
         let userInfo = this.$store.state.app.userInfo;
-        if(typeof userInfo == 'string')userInfo= JSON.parse(userInfo);
+        if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
         let showFlag = '';
-        postData.attrValue.forEach(t=>{
-          if(userInfo?.mer_info?.type_code=="TypeSupplyChain" && (!t.procure_price||+t.procure_price<=0) ){
+        postData.attrValue.forEach(t => {
+          if (userInfo?.mer_info?.type_code == "TypeSupplyChain" && (!t.procure_price || +t.procure_price <= 0)) {
             showFlag = '批发价不能小于0'
           }
-          if(!t.price||+t.price<=0) showFlag = '零售价不能小于0';
-          if(!t.stock||+t.stock<=0) showFlag = '库存不能小于0';
-          if(!t.cost||+t.cost<=0) showFlag = '成本价不能小于0';
+          if (!t.price || +t.price <= 0) showFlag = '零售价不能小于0';
+          if (!t.stock || +t.stock <= 0) showFlag = '库存不能小于0';
+          if (!t.cost || +t.cost <= 0) showFlag = '成本价不能小于0';
         })
-        if(showFlag) {
-          if(this.setFormData.spec_type==1) showFlag+=', 请点击设置多规格设置';
+        if (showFlag) {
+          if (this.setFormData.spec_type == 1) showFlag += ', 请点击设置多规格设置';
           return Toast(showFlag);
         }
         Loading();
@@ -651,7 +653,7 @@
             .catch(rej => {
               Toast(rej);
             });
-        
+
         } else {
           productCreate(this.merId, postData)
             .then(res => {
@@ -659,11 +661,10 @@
               Modal('提交成功', '点击确定，返回商品管理', {
                 showCancel: false,
               }).then(() => {
-                if(this.import==1){
+                if (this.import == 1) {
                   uni.$emit('importAttrValueOK', this.setFormData.import_id);
                   uni.navigateBack();
-                }
-                else uni.redirectTo({
+                } else uni.redirectTo({
                   url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
                 })
               })
@@ -674,30 +675,30 @@
         }
       },
       // 选择规格
-      changeSpecType(e){
-        if(this.setFormData.spec_type!=e.detail.value){
+      changeSpecType(e) {
+        if (this.setFormData.spec_type != e.detail.value) {
           this.showSpecType = true;
         }
         this.spec_type = e.detail.value;
       },
       // 二次确认
-      changeSpecType2(){
+      changeSpecType2() {
         this.showSpecType = false;
         this.setFormData.spec_type = this.spec_type + '';
         this.setFormData.attrValue = [];
         this.setFormData.attr = [];
       },
       // 跳转多规格页面
-      navToSpecGood(){
+      navToSpecGood() {
         uni.navigateTo({
-          url:'/pages/product/addGood/specGood?product_id=' + this.product_id,
+          url: '/pages/product/addGood/specGood?product_id=' + this.product_id,
           success: (e) => {
             // console.log(this.setFormData.attrValue, e);
             e.eventChannel.emit('updateAttrValue', {
               attrValue: JSON.parse(JSON.stringify(this.setFormData.attrValue)),
               attr: JSON.parse(JSON.stringify(this.setFormData.attr))
             });
-            uni.$once('updateSpecType', (e)=>{
+            uni.$once('updateSpecType', (e) => {
               this.setFormData.attrValue = JSON.parse(JSON.stringify(e.attrValue));
               this.setFormData.attr = JSON.parse(JSON.stringify(e.attr));
             })

pages/product/addGood/components/price.vue

@@ -165,7 +165,8 @@
         else this.formList.splice(len-1, this.formList.length);
       },
       setDatas(data){
-        this.singleSpecification = data;
+        console.log('收到', data);
+        this.singleSpecification = {...data};
       },
       input(val) {
         this.singleSpecification = val

pages/users/order_list/indexCopy.vue

@@ -525,7 +525,7 @@
 				goMall(item) {
 					if (this.hide_mer_status == 0) {
 						uni.navigateTo({
-							url: '/pages/store/home/index?id=' + item.mer_id
+							url: '/pages/nongKe/supply_chain/merchant?id=' + item.mer_id
 						})
 					}
 				},