Pārlūkot izejas kodu

推广添加个人信息 社区动态评论添加参数 消息模块详情 修改分页传参

743180155@qq.com 1 gadu atpakaļ
vecāks
revīzija
c019504fd4

+ 1 - 0
src/components/communityPop/index.vue

@@ -98,6 +98,7 @@ export default {
     handlerPopPublishBtn() {
       let params = {
         dynamicId: this.dynamicId,
+		targetUserId:this.dynamicUserId,
         parentId: 0,
         content: this.content,
         status: 0,

+ 8 - 8
src/components/tabbar/index.vue

@@ -55,14 +55,14 @@ export default {
           iconPath: '/static/images/community.png',
           selectedIconPath: '/static/images/community-select.png',
         },
-        // {
-        //   text: '推广',
-        //   // text: '推广码',
-        //   name: 'promotionCode',
-        //   pagePath: 'pages/client/tabBar/promotionCode/index',
-        //   iconPath: '/static/images/rqcode.png',
-        //   selectedIconPath: '/static/images/rqcode-select.png',
-        // },
+        {
+          text: '推广',
+          // text: '推广码',
+          name: 'promotionCode',
+          pagePath: 'pages/client/tabBar/promotionCode/index',
+          iconPath: '/static/images/rqcode.png',
+          selectedIconPath: '/static/images/rqcode-select.png',
+        },
         {
           text: '消息',
           name: 'clientMessage',

+ 4 - 1
src/pages.json

@@ -483,7 +483,10 @@
       },
       {
         "pagePath": "pages/client/tabBar/mine/index"
-      }
+      },
+	  {
+	    "pagePath": "pages/client/tabBar/promotionCode/index"
+	  }
     ]
   },
   "globalStyle": {

+ 1 - 2
src/pages/client/clientPackage/message/benefits/index.vue

@@ -33,8 +33,7 @@ export default {
   data() {
     return {
       queryParams:{
-        number:1,
-        size:10,
+        paging:'1,10',
         counting:true
       }
     };

+ 1 - 2
src/pages/client/clientPackage/message/evaluateNotice/index.vue

@@ -45,8 +45,7 @@ export default {
   data(){
     return{
       queryParams:{
-        number:1,
-        size:10,
+        paging:'1,10',
         counting:true
       }
     }

+ 3 - 2
src/pages/client/clientPackage/message/orderNotice/index.vue

@@ -32,8 +32,9 @@ export default {
   data() {
     return {
       queryParams:{
-        number:1,
-        size:10,
+        // number:1,
+        // size:10,
+		paging:'1,10',
         counting:true
       }
     };

+ 1 - 1
src/pages/client/clientPackage/orderAll.vue

@@ -12,7 +12,7 @@
           <view class="" @click="handlerSkipDetail(item)">
             <view class="item-top">
               <view class="top-left gray-color">订单编号 : {{ item.orderSn }}</view>
-              <view class="top-right">待付款</view>
+              <view class="top-right">{{ type_name }}</view>
             </view>
             <view class="item-top">
               <view class="top-left gray-color">支付时间 : 2024-01-12</view>

+ 1 - 0
src/pages/client/tabBar/community/index.vue

@@ -189,6 +189,7 @@
       },
       // 查询动态评论
       handlerRequireComment(item) {
+		  console.log(item)
         this.dynamicId = item.id
         this.dynamicUserId = item.userId
         this.communityShow = true

+ 7 - 3
src/pages/client/tabBar/promotionCode/index.vue

@@ -2,10 +2,10 @@
   <view class="page">
 
     <view class="img-box">
-      <image src="@/static/images/honglei.png" class="img" mode="aspectFill"></image>
+      <image :src="avatar" class="img" mode="aspectFill"></image>
       <view class="img-text">
-        <view class="name">你TM劈我瓜是吧</view>
-        <view class="address">山东 潍坊</view>
+        <view class="name">{{ nickname }}</view>
+        <view class="address">{{ location.address }}</view>
       </view>
     </view>
 
@@ -22,6 +22,7 @@
 
 <script>
   import uQrcode from '@/uni_modules/Sansnn-uQRCode/components/u-qrcode/u-qrcode.vue';
+  import { mapGetters } from "vuex"
   export default {
     data() {
       return {
@@ -32,6 +33,9 @@
     components: {
       uQrcode
     },
+	computed:{
+		...mapGetters(['location','avatar','nickname'])
+	},
     methods: {
       complete(e) {
         if (e.success) {

+ 9 - 2
src/pages/merchant/mine/index.vue

@@ -26,7 +26,7 @@
               +86 {{ merchantInfo.mobileNumber }}
             </view>
             <view v-else class="text">
-              <text style="color: #f6bf3f"> 您当前还未认证,</text>去认证>
+              <text style="color: #f6bf3f"> 您当前还未认证,</text> <span @click="toApprove">去认证></span>
             </view>
           </view>
         </view>
@@ -238,7 +238,7 @@ export default {
         url: '/pages/merchant/mine/setting/index',
       });
     },
-
+	
     // 获取商家信息
     async getMerchantAuth() {
       let res = await getMerchantAuthData();
@@ -257,6 +257,13 @@ export default {
         this.$store.commit('SET_MERCHANTINFO', res.data);
       }
     },
+	
+	// 跳转到商家认证
+	toApprove(){
+		uni.navigateTo({
+			url:'/pages/merchant/mine/openStore/index'
+		})
+	}
   },
 };
 </script>