更新

pages/activeCode/subsidy.vue

@@ -5,8 +5,10 @@
         src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/87960202402291430371479.webp"></image>
       <view class="card" :class="{card2:type==2}">
         <view class="c-head">
-          <view :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view>
           <view :class="type==2?'left':'right'" @click="changeType(2)">增收销售补贴</view>
+          <!-- <view :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view> -->
+          <view v-if="mer_info.type_code=='PersonalStore'" :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view>
+          <view v-else></view>
         </view>
         <view class="c-body-title">
           <view>补贴金额</view>
@@ -61,8 +63,8 @@
       </view>
       <view class="b-card">
         <view class="b-top">
-          <view>采购目标金额{{info.purchase_amount}}元</view>
+          <view>采购目标金额{{info.purchase_target}}元</view>
-          <view>当前进度{{info.purchase_target}}元</view>
+          <view>当前进度{{info.purchase_amount}}元</view>
         </view>
         <view class="b-bottom">
           <view class="pro">
@@ -112,19 +114,24 @@
   export default {
     data() {
       return {
-        type: 1,
+        type: 2,
         mer_id: '',
         info: {},
         list: [],
         where:{
           page: 1,
-          limit: 20
+          limit: 20,
+          type: 2
+        },
+        mer_info:{
+          type_code: ''
         }
       }
     },
     onLoad() {
       let user = this.$store.state.app.userInfo;
       if(typeof user == 'string') user = JSON.parse(user);
+      this.mer_info.type_code = user.mer_info.type_code;
       this.mer_id = user.service.mer_id;
       this.getSubsidy();
       if(this.type==2)this.getSubsidyRecord();
@@ -183,7 +190,7 @@
       transform: translate(-50%);
       width: 670rpx;
       height: 290rpx;
-      background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e5b2e202402291538018132.webp');
+      background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b4cfc20240229163236372.webp');
       background-size: 100% 100%;
       background-repeat: no-repeat;
       padding-bottom: 40rpx;
@@ -193,6 +200,10 @@
         height: 90rpx;
         overflow: hidden;
         margin-top: 20rpx;
+        view{
+          flex: 1;
+          text-align: center;
+        }
         .left{
           font-size: 32rpx;
           color: #DF4104;
@@ -222,7 +233,7 @@
       }
     }
     .card2{
-      background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b4cfc20240229163236372.webp');
+      background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e5b2e202402291538018132.webp');
     }
     .bottom{
       position: absolute;

pages/index/index.vue

@@ -616,6 +616,11 @@ import { Toast } from '../../libs/uniApi';
             type: 15,
             image: require('@/static/images/index13.png')
           },
+          {
+            name: '补贴进度',
+            type: 16,
+            image: require('@/static/images/index23.png')
+          },
         ],
         refundInfo: {},
         company: '',
@@ -1346,6 +1351,12 @@ import { Toast } from '../../libs/uniApi';
                   url: '/pages/users/order_list/indexOther?status=-1&product_type=98&source=12'
                 })
                 break;
+              case 16:
+                if(this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
+                else uni.navigateTo({
+                  url: '/pages/activeCode/subsidy'
+                })
+                break;
               default:
                 uni.navigateTo({
                   url: '/pages/moreProject/moreProject'

pages/moreProject/moreProject.vue

@@ -244,11 +244,11 @@
                   <text class="text">补货订单</text>
                 </view>
                 
-                <view class="examine" @click="navigator(`/pages/activeCode/activeCode`)">
+                <!-- <view class="examine" @click="navigator(`/pages/activeCode/activeCode`)">
                   <image class="icon_img" src="@/static/images/index22.png" mode="aspectFit">
                   </image>
                   <text class="text">活动邀请码</text>
-                </view>
+                </view> -->
                 <view class="examine" @click="navigator(`/pages/activeCode/subsidy`)">
                   <image class="icon_img" src="@/static/images/index23.png" mode="aspectFit">
                   </image>
@@ -344,11 +344,11 @@
                   <text class="text">商户设置</text>
                 </view>
                 
-                <view class="examine" @click="navigator(`/pages/activeCode/activeCode`)">
+               <!-- <view class="examine" @click="navigator(`/pages/activeCode/activeCode`)">
                   <image class="icon_img" src="@/static/images/index22.png" mode="aspectFit">
                   </image>
                   <text class="text">活动邀请码</text>
-                </view>
+                </view> -->
                 
                 <view class="examine" @click="navigator(`/pages/activeCode/subsidy`)">
                   <image class="icon_img" src="@/static/images/index23.png" mode="aspectFit">
@@ -432,11 +432,11 @@
                 </view>
                 
                 
-                <view class="examine" @click="navigator(`/pages/activeCode/activeCode`)">
+                <!-- <view class="examine" @click="navigator(`/pages/activeCode/activeCode`)">
                   <image class="icon_img" src="@/static/images/index22.png" mode="aspectFit">
                   </image>
                   <text class="text">活动邀请码</text>
-                </view>
+                </view> -->
                 
                 <view class="examine" @click="navigator(`/pages/activeCode/subsidy`)">
                   <image class="icon_img" src="@/static/images/index23.png" mode="aspectFit">