Merge branch 'new' of https://gitea.lihaink.cn/mkm/shop-applet into new

pages/activeCode/subsidy.vue

@@ -35,7 +35,7 @@
         </view>
         <view class="b-bottom">
           <view class="pro">
-            <view class="loss">
+            <view class="loss" :style="{left: `-${100-info.spring_subsidy_rate}%`}">
               <image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
               <view class="text">{{info.spring_subsidy_rate}}%</view>
             </view>

pages/nongKe/gather/select_warehouse.vue

@@ -286,14 +286,14 @@
       this.mer_id = e.mer_id
       this.userInfo = this.$store.state.app.userInfo;
       if(typeof this.userInfo == 'string') this.userInfo = JSON.parse(this.userInfo);
-      if(this.userInfo.mer_info.type_code=='PersonalStore'){
-        this.goodsData = [{
-            name: '农产品入库',
-            type: 4,
-            // src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
-            src: '/static/images/SMRK/nong.png'
-          }]
-      }
+      // if(this.userInfo.mer_info.type_code=='PersonalStore'){
+      //   this.goodsData = [{
+      //       name: '农产品入库',
+      //       type: 4,
+      //       // src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
+      //       src: '/static/images/SMRK/nong.png'
+      //     }]
+      // }
     },
     onShow() {