更新

components/activePopup.vue

@@ -10,7 +10,7 @@
     	    </view>
     	  </view>
     	  <image class="head_img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/ab014202402291802294524.png" info="活动标题"></image>
-    	  <view class="head_title">春耕采购补贴</view>
+    	  <view class="head_title">增收销售补贴</view>
     	  <image class="close_img" @click="close" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/close.png" info="关闭按钮"></image>
     	</view>
     </uni-popup>
@@ -22,22 +22,33 @@
   export default {
     data(){
       return {
-        info: ''
+        info: '',
+        userInfo: {}
       }
     },
     created() {
-      
+      let user = this.$store.state.app.userInfo;
+      if(typeof user =='string') user = JSON.parse(user);
+      this.userInfo = user;
+      this.getArticleList();
     },
     watch:{
       
     },
     methods:{
       close(){
-        this.$emit('close');
+        this.$refs.activityPopup.close();
       },
       getArticleList(){
         getArticleList(28).then(res=>{
-          console.log(res);
+          if(this.userInfo.mer_info.type_code=='PersonalStore'){
+            this.info = res.data.list[0];
+            this.$refs.activityPopup.open();
+          }
+          else {
+            this.info = res.data.list[1];
+            this.$refs.activityPopup.open();
+          }
         })
       }
     }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.2.1",
+    "versionName" : "1.2.2",
-    "versionCode" : 121,
+    "versionCode" : 122,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/index/index.vue

@@ -403,6 +403,7 @@
         </form>
       </view>
     </uni-popup>
+    <activePopup v-if="userInfoData.mer_info.type_id"></activePopup>
   </view>
 </template>
 
@@ -410,6 +411,7 @@
   import authorize from '@/components/Authorize';
   import ordertime from './component/timelist.vue'
   import retuntop from '@/components/content-top/index.vue';
+  import activePopup from '@/components/activePopup.vue';
   import {
 
     setAdminOrderRemark
@@ -439,8 +441,8 @@ import { Toast } from '../../libs/uniApi';
     components: {
       authorize,
       ordertime,
-      retuntop
+      retuntop,
-
+      activePopup
     },
     data() {
       return {

pages/moreProject/moreProject.vue

@@ -96,6 +96,17 @@
                 </image>
                 <text class="text">委托订单</text>
               </view>
+              <view class="examine" @click="navigator(`/pages/activeCode/subsidy`)">
+                <image class="icon_img" src="@/static/images/index23.png" mode="aspectFit">
+                </image>
+                <text class="text">补贴进度</text>
+              </view>
+              <view class="examine" @click="navigator(`/pages/payment/qrcode`)">
+                <image class="icon_img" src="@/static/images/index24.png" mode="aspectFit">
+                </image>
+                <text class="text">面对面收款</text>
+              </view>
+              
               <!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
 							<image class="icon_img"
 								src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png"  mode="aspectFit">