1

pages/MallMange/index.vue

@@ -12,7 +12,7 @@
             :src="photo"
             class="headimg"
           />
-          <view class="name1">饭粒汪</view>
+          <view class="name1">{{mallName}}</view>
         </view>
         <view
           style="
@@ -196,7 +196,7 @@
           >30日</view
         >
       </view>
-      <view style="height: 100rpx"></view>
+      <view style="height: 20rpx"></view>
       <canvas
         canvas-id="canvasColumn"
         id="canvasColumn"
@@ -224,6 +224,7 @@ export default {
   data() {
     return {
       photo:"",//头像
+      mallName:"",
       array: [
         {
           name: "支付金额",
@@ -302,7 +303,7 @@ export default {
         canvasId: canvasId,
         type: "line",
         fontSize: 11,
-        padding: [5, 15, 15, 15],
+        padding: [15, 15, 15, 15],
         legend: {
           show: false,
           position: "top",
@@ -322,7 +323,6 @@ export default {
           gridType: "dash",
           itemCount: 4,
           labelCount: chartData.categories.length,
-          scrollShow: true,
           scrollAlign: "right",
           dashLength: 8,
           gridColor: "#FFFFFF",
@@ -516,7 +516,9 @@ export default {
     });
     this.getBasicData();
     this.photo=uni.getStorageSync('mall_UserInfo')?.Photo
+    this.mallName=uni.getStorageSync('mall_UserInfo').MallName
 	this.getOrderNumber();
+   
   },
 };
 </script>

pages/MallMange/order.vue

@@ -17,7 +17,7 @@
       </view>
     </view>
     <view class="searchBox flex-between">
-      <view class="search flex-center" @click="jumpSearch">
+      <view class="search flex-center" @click="goOrderSearch">
         <u-icon name="search"></u-icon>
         <view>搜索</view>
       </view>
@@ -324,14 +324,9 @@ export default {
     };
   },
   methods: {
-    jumpSearch(){
-      uni.navigateTo({
-         url: '/pages/MallMange/orderSearch'
-      });
-    },
     goOrderSearch(){
 				uni.navigateTo({
-				  url: '/pages/MallMange/orderSearch?orderType='+this.orderType
+				  url: '/pages/MallMange/orderSearch?type='+this.orderType
 				});
 			},
     //筛选时间

pages/MallMange/orderSearch.vue

@@ -5,10 +5,13 @@
 				<u-search v-if="orderType==1" placeholder="请输入订单号" style="width:600rpx" bg-color="#fff" height="60"
 					:show-action="false" v-model="msg1.OrderNo"></u-search>
 				<u-search v-if="orderType==2" placeholder="请输入订单号" style="width:600rpx" bg-color="#fff" height="60"
-					:show-action="false" @change="getList2()" v-model="msg2.ReOrderNo"></u-search>
+					:show-action="false" v-model="msg2.ReOrderNo"></u-search>
 			</view>
-			<view class="flex-center">
-				取消
+			<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"
@@ -191,6 +194,10 @@
 				this.readMsg.Id = options.Id;
 				this.getOrderRead();
 			}
+			console.log(1,options)
+			if(options.type){
+				this.orderType=parseInt(options.type)
+			}
 		},
 	};
 </script>