1

pages/MallMange/components/tabbar.vue

@@ -164,14 +164,16 @@ export default {
 					color:"#CCCED5",
 					active_color:"#446dfc",
 					text:"订单",
-				},{
-					url:"/pages/MallMange/goods",
-					icon:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/goods2.png",
-					active_icon:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/goods.png",
-					color:"#CCCED5",
-					active_color:"#446dfc",
-					text:"商品",
-				},{
+				},
+        // {
+				// 	url:"/pages/MallMange/goods",
+				// 	icon:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/goods2.png",
+				// 	active_icon:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/goods.png",
+				// 	color:"#CCCED5",
+				// 	active_color:"#446dfc",
+				// 	text:"商品",
+				// },
+        {
 					url:"/pages/MallMange/set",
 					icon:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/setup-fill2.png",
 					active_icon:"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/setup-fill.png",
@@ -182,11 +184,9 @@ export default {
     };
   },
   mounted() {
-    console.log("B join...");
     this.flagTypeInfo = this.$uiConfig.is_bang;
     let tempSystem = uni.getSystemInfoSync();
     this.platforms = tempSystem.platform;
-
     this.$nextTick(() => {
       // #ifdef APP-NVUE || APP-PLUS || APP-PLUS-NVUE ||APP-VUE
       if (this.platforms == "android") {
@@ -197,17 +197,6 @@ export default {
     });
     this.activeHandler();
   },
-  // activated(){
-  //   if(uni.getStorageSync("navs")){
-  //     this.navs = uni.getStorageSync("navs")??[];
-  //   }else{
-  //     setTimeout(()=>{
-  //       this.navs = uni.getStorageSync("navs")??[];
-  //       this.activeHandler();
-  //     },3000)
-  //   }
-  //   this.activeHandler();
-  // },
   methods: {
     activeHandler() {
       let t = getCurrentPages();
@@ -220,7 +209,6 @@ export default {
         queryString = "?" + queryString.substring(1, queryString.length);
       }
       this.crtPath = "/" + t[t.length - 1].route + queryString;
-      console.log(23,this.crtPath);
       this.navs.forEach((x, i) => {
         if (x.url == this.crtPath) {
           this.active = i;

pages/MallMange/index.vue

@@ -19,12 +19,12 @@
             width: 100rpx;
           "
         >
-          <image
+          <!-- <image
             src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/qr_code.png"
             class="ewmimg"
             mode="aspectFill"
           />
-          <view class="name2">收款码</view>
+          <view class="name2">收款码</view> -->
         </view>
       </view>
       <view class="msgBox flex-center">
@@ -419,7 +419,8 @@ export default {
               (_self.payType == "支付金额" ? "元" : "")
             );
           } else {
-            return category + " " + item.name + ":" + item.data + "元";
+            return category + " " + item.name + ":" + item.data + 
+              (_self.payType == "支付金额" ? "元" : "");
           }
         },
       });
@@ -534,7 +535,6 @@ export default {
       };
       this.requestAdmin("/api/user/GetDistributorRemitPageList", msg, (res) => {
         this.txNumber=res.data.count
-        console.log(533,this.txNumber)
       });
     },
   },

pages/MallMange/order.vue

@@ -324,11 +324,11 @@ export default {
     };
   },
   methods: {
-    goOrderSearch(){
-				uni.navigateTo({
-				  url: '/pages/MallMange/orderSearch?type='+this.orderType
-				});
-			},
+    goOrderSearch() {
+      uni.navigateTo({
+        url: "/pages/MallMange/orderSearch?type=" + this.orderType,
+      });
+    },
     //筛选时间
     confirm() {
       if (this.orderType === 1) {
@@ -566,13 +566,16 @@ export default {
     });
     this.getOrderStatus();
     this.getAfterSalesOrderstatus();
-    if (options?.orderType) {
+    if (options.orderType) {
       this.orderType = parseInt(options.orderType);
     }
-    if (options?.tab) {
-      this.currentTab = parseInt(options.tab);
-    }
+
     if (this.orderType === 1) {
+      if (options.tab) {
+        this.currentTab = parseInt(options.tab);
+        this.msg.OrderStatus = parseInt(options.tab)
+      }
+      
       this.getList();
     } else if (this.orderType === 2) {
       this.getList2();

pages/MallMange/orderSearch.vue

@@ -8,10 +8,10 @@
 					:show-action="false" v-model="msg2.ReOrderNo"></u-search>
 			</view>
 			<view class="flex-center" v-if="orderType==1" @click="getList1">
-				搜索1
+				搜索
 			</view>
 			<view class="flex-center" v-if="orderType==2" @click="getList2">
-				搜索2
+				搜索
 			</view>
 		</view>
 		<view v-if="orderList.length > 0"

pages/MallMange/set.vue

@@ -4,7 +4,9 @@
 		<view class="topBox">
 			<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/bg.png" mode="widthFix"
 				class="bg" />
-			<view class="headImgBox"></view>
+			<view class="headImgBox">
+				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/mallManage/home2.png" style="width:100%;height:100%" mode="aspectFit" />
+			</view>
 			<view class="nameBox">{{ msg.MallName }}
 				<u-icon name="edit" style="margin-left: 10rpx" @click="showBox1 = true"></u-icon>
 			</view>
@@ -314,7 +316,7 @@
 				</view>
 				<view class="rightBox">
 					<view class="name">余额功能</view>
-					<u-switch v-model="msg.BalanceFun" :active-value="1" :inactive-value="0" @change="BalanceFun">
+					<u-switch v-model="msg.BalanceFun" @change="BalanceFun">
 					</u-switch>
 				</view>
 			</view>
@@ -325,7 +327,7 @@
 				</view>
 				<view class="rightBox" style="border: none">
 					<view class="name">储值卡功能</view>
-					<u-switch v-model="msg.DepositFun" :active-value="1" :inactive-value="0" @change="DepositFun">
+					<u-switch v-model="msg.DepositFun" @change="DepositFun">
 					</u-switch>
 				</view>
 			</view>
@@ -384,7 +386,7 @@
 				</view>
 				<view class="rightBox" style="border: none">
 					<view class="name">开关</view>
-					<u-switch v-model="msg.MinSwitch" :active-value="1" :inactive-value="0"></u-switch>
+					<u-switch v-model="msg.MinSwitch" @change="MinSwitch"></u-switch>
 				</view>
 			</view>
 			<template v-if="msg.MinSwitch">
@@ -457,7 +459,7 @@
 				</view>
 				<view class="rightBox" style="border: none">
 					<view class="name">开关</view>
-					<u-switch v-model="msg.BuySwitch" :active-value="1" :inactive-value="0"></u-switch>
+					<u-switch v-model="msg.BuySwitch" @change="BuySwitch"></u-switch>
 				</view>
 			</view>
 			<view class="boxItem">
@@ -838,7 +840,9 @@
 			},
 			//获取设置数据
 			getSetup() {
+				this.loading=true
 				this.requestAdmin("/api/MallBase/GetMallBaseInfo", {}, (res) => {
+					this.loading=false
 					this.msg = res.data;
 					//支付方式
 					this.payTypeArr.forEach((e) => {
@@ -893,6 +897,12 @@
 			DepositFun(e) {
 				this.msg.DepositFun = Number(e)
 			},
+			MinSwitch(e) {
+				this.msg.MinSwitch = Number(e)
+			},
+			BuySwitch(e) {
+				this.msg.BuySwitch = Number(e)
+			},
 		},
 		onLoad() {
 			uni.setNavigationBarTitle({
@@ -942,7 +952,7 @@
 			border-radius: 50%;
 			border: 4rpx solid #fff;
 			overflow: hidden;
-			background-color: #f00;
+			background-color: #5FAAFE;
 		}
 
 		.nameBox {

pages/MallMange/userManage.vue

@@ -745,6 +745,8 @@ export default {
   margin: 40rpx 0 40rpx 28rpx;
   padding: 20rpx;
   width: 500rpx;
+  border-radius: 10rpx;
+  font-size: 30rpx;
 }
 
 .userManInput {