1

components/auth/index.vue

@@ -227,14 +227,7 @@ export default {
             // ----------橙霜---------------
             let AppletID = this.GetMiniAppId().TenantId;
             if (AppletID === 24) {
-              let basedata = wx.getStorageSync("basedata");
-              let isAttestation = basedata?.user_info?.isAttestation ?? 0;
-              let IsOpenGuide = wx.getStorageSync("basedata")?.mall?.setting?.IsOpenGuide??0;
-              if (isAttestation === 0&&IsOpenGuide===1) {
-                uni.navigateTo({
-                  url: "/pages/user-center/user-center",
-                });
-              }
+              this.updateData();
             }
             // --------------------------------
             if (res.couponResultCode == 1) {
@@ -281,6 +274,26 @@ export default {
     closeBtn() {
       this.showCoupons = false;
     },
+    updateData() {
+      this.request2(
+        {
+          url: "/api/Mall/GetHome",
+          data: {},
+        },
+        (res) => {
+          uni.setStorageSync("basedata", res.data);
+          let basedata = uni.getStorageSync("basedata");
+          let isAttestation = basedata?.user_info?.isAttestation ?? 0;
+          let IsOpenGuide =
+            wx.getStorageSync("basedata")?.mall?.setting?.IsOpenGuide ?? 0;
+          if (isAttestation === 0 && IsOpenGuide === 1) {
+            uni.navigateTo({
+              url: "/pages/user-center/user-center",
+            });
+          }
+        }
+      );
+    },
   },
 };
 </script>

pages/MallMange/components/orderItem.vue

@@ -29,7 +29,9 @@
       </view>
       <view class="goodsBox">
         <view class="goodsName">{{ item.GoodsName }}</view>
-        <view class="weight">规格：{{getSpecificationsStr(item.SpecificationList)}}</view>
+        <view class="weight"
+          >规格：{{ getSpecificationsStr(item.SpecificationList) }}</view
+        >
         <view class="flex-between">
           <text>x{{ item.Number }}</text>
           <text>￥{{ item.SmallShopsCostPrice }}</text>
@@ -44,18 +46,24 @@
       >
     </view>
     <view class="btnBox">
-      <button class="btn" @click="modal = true">备注</button>
-      <button class="btn">拒绝</button>
-      <button class="btn">同意</button>
+      <button class="btn" @click="modal = true" v-if="orderType === 1">备注</button>
+      <button class="btn" v-if="orderType === 2">拒绝</button>
+      <button class="btn" v-if="orderType === 2">同意</button>
     </view>
     <u-modal
       v-model="modal"
       :show-cancel-button="false"
-      @confirm="modal = false"
+      @confirm="confirm"
       contentSlot
       title="备注"
     >
-      <input type="number" class="input" placeholder="(限15字)" :maxlength="15" v-model="data.Remark" />
+      <input
+        type="number"
+        class="input"
+        placeholder="(限15字)"
+        :maxlength="15"
+        v-model="exitMsg.Remark"
+      />
     </u-modal>
   </view>
 </template>
@@ -63,10 +71,16 @@
 export default {
   props: {
     data: Object,
+    orderType:Number,
   },
   data() {
     return {
       modal: false,
+      exitMsg: {
+        OrderId: 0,
+        Type: 1,
+        Remark: "",
+      },
     };
   },
   methods: {
@@ -75,13 +89,29 @@ export default {
         phoneNumber: num,
       });
     },
-    getSpecificationsStr(arr){
-      let str=arr.map((e)=>{return e}).toString()
-      return str
+    getSpecificationsStr(arr) {
+      let str = arr
+        .map((e) => {
+          return e;
+        })
+        .toString();
+      return str;
+    },
+    setOrderInfo() {
+      this.requestAdmin("/api/order/SetOrderOperation", this.exitMsg, (res) => {
+        if (res.resultCode === 1) {
+          this.$emit('update')
+        } 
+      });
+    },
+    confirm(){
+      this.modal=false;
+      this.setOrderInfo();
     }
   },
-  mounted() {
-    console.log(54, this.data);
+  created() { 
+    this.exitMsg.Remark=this.data?.Remark;
+    this.exitMsg.OrderId=this.data?.OrderId;
   },
 };
 </script>

pages/MallMange/index.vue

@@ -40,14 +40,14 @@
           <view class="iconname">订单消息</view>
           <view class="tipNum">1</view>
         </view>
-        <view class="itemBox">
+        <!-- <view class="itemBox">
           <image
             src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/msg.png"
             mode=""
             class="imgicon"
           />
           <view class="iconname">审核消息</view>
-        </view>
+        </view> -->
         <view class="itemBox">
           <image
             src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/cash.png"

pages/MallMange/order.vue

@@ -148,7 +148,11 @@
         v-if="orderType === 2"
       ></u-tabs>
     </view>
-    <u-empty v-if="orderList.length == 0" text="暂无相关订单" mode="order"></u-empty>
+    <u-empty
+      v-if="orderList.length == 0"
+      text="暂无相关订单"
+      mode="order"
+    ></u-empty>
     <view
       v-if="orderList.length > 0"
       style="
@@ -167,7 +171,7 @@
         :style="{ height: '100%' }"
       >
         <view v-for="(item, index) in orderList" :key="index">
-          <orderItem :data="item" />
+          <orderItem :data="item" :orderType="orderType" @update="updateList" />
         </view>
         <u-loadmore
           :status="status"
@@ -427,10 +431,6 @@ export default {
           Id: 0,
           Name: "全部",
         });
-        this.orderStatusList.push({
-          Id: 8,
-          Name: "回收站",
-        });
       });
     },
     //普通订单数据
@@ -500,6 +500,16 @@ export default {
         }
       );
     },
+    // 刷新页面
+    updateList() {
+      if (this.orderType === 1) {
+        this.msg.pageIndex = 1;
+        this.getList();
+      } else if (this.orderType === 2) {
+        this.msg2.pageIndex = 1;
+        this.getList2();
+      }
+    },
   },
   onLoad(options) {
     this.timeStr = this.timeArr[0].name;