diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 0ef10f7..c04ac6f 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,13 +17,11 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
-<<<<<<< HEAD
-  baseURL = 'http://192.168.2.107:9003';
-=======
-  baseURL = 'http://10.0.0.51:9003';
->>>>>>> 9ffe7fd70c4f3476b43d932385794fadee51b6f0
+  // baseURL = 'http://192.168.2.107:9003';
+
+  // baseURL = 'http://10.0.0.51:9003';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
 
diff --git a/admin-web-master/src/views/renovation/brand/form.vue b/admin-web-master/src/views/renovation/brand/form.vue
index 07208db..93538d1 100644
--- a/admin-web-master/src/views/renovation/brand/form.vue
+++ b/admin-web-master/src/views/renovation/brand/form.vue
@@ -23,7 +23,8 @@
           <el-input v-model="form.brandName" placeholder="请输入品牌名称" />
         </el-form-item>
         <el-form-item label="logo" prop="brandLogo">
-          <ImageUpload v-model="form.brandLogo" :limit="1" />
+          <ImageUpload filePath="bueniss" :value="form.brandLogo" inputtype="brandLogo" :limit="1"
+          @changimg="e=>changimg(e,'brandLogo')"></ImageUpload>
         </el-form-item>
       </el-form>
       <span
@@ -111,6 +112,9 @@ export default {
     }
   },
   methods: {
+    changimg(e, type) {
+        this.form[type] = e
+      },
     handleSubmit () {
       this.$refs.form.validate(async val => {
         this.loading = true
diff --git a/admin-web-master/src/views/renovation/brand/index.vue b/admin-web-master/src/views/renovation/brand/index.vue
index 05b8ec2..2ce8f3a 100644
--- a/admin-web-master/src/views/renovation/brand/index.vue
+++ b/admin-web-master/src/views/renovation/brand/index.vue
@@ -35,7 +35,7 @@
           label="Logo"
         >
           <template v-slot="scope">
-            <el-image :src="scope.row.brandLogo" :preview-src-list="[scope.row.brandLogo]" style="width: 100px;height: 100px" />
+            <el-image :src="$baseURL+scope.row.brandLogo" :preview-src-list="[scope.row.brandLogo]" style="width: 100px;height: 100px" />
           </template>
         </el-table-column>
         <el-table-column
@@ -96,6 +96,7 @@ export default {
     this.getList()
   },
   methods: {
+ 
     async getList () {
       this.loading = true
       const { data } = await getBrandAll(this.query);
diff --git a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
index 231adf3..1026270 100644
--- a/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
+++ b/admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
@@ -4,9 +4,9 @@
       <el-card class="box-card" >
        <div style="display:flex;justify-content: space-between;">
          <div class="addTitle">商品详情</div>
-         <el-button class="buttonHover"
+         <div><el-button class="buttonHover"
              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">关闭</el-button>
-         <el-button v-if="productItem.shelveState === 2" style="background-color: #3F9B6A;color: #fff" @click="examineShow(productData)">审核</el-button>
+         <el-button v-if="productItem.shelveState === 2" style="background-color: #3F9B6A;color: #fff" @click="examineShow(productData)">审核</el-button></div>
        </div>
       </el-card>
       <el-card class="box-card">
@@ -18,12 +18,12 @@
               <div>商品卖点：{{ productItem.productBrief }}</div>
               <div>
                 商品图片：
-                <div>
+                <div >
                   <img
                     v-for="(item, index) in productItem.images"
                     :key="index"
                     class="proImage"
-                    :src="item.imgPath"
+                    :src="$baseURL+item.imgPath"
                     alt=""
                     @click="handlePictureCardPreview(item)"
                   >
@@ -220,7 +220,7 @@ export default {
       this.details()
     },
     handlePictureCardPreview (item) {
-      this.dialogImageUrl = item.imgPath;
+      this.dialogImageUrl = this.$baseURL+item.imgPath;
       this.dialogVisible = true;
     },
 
diff --git a/admin-web-master/src/views/renovation/commoditySystem/index.vue b/admin-web-master/src/views/renovation/commoditySystem/index.vue
index 11b1e74..fc12260 100644
--- a/admin-web-master/src/views/renovation/commoditySystem/index.vue
+++ b/admin-web-master/src/views/renovation/commoditySystem/index.vue
@@ -73,7 +73,7 @@
           />
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
-              <img height="80" width="80" :src="scope.row.image" alt srcset>
+              <img height="80" width="80" :src="$baseURL+msgList(scope.row.image)" alt srcset>
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" width="180" />
@@ -262,6 +262,12 @@ export default {
   },
   // 方法集合
   methods: {
+    msgList(list){
+      if(list && list!=''){
+        let strin = list.split(',')
+        return strin[0]
+      }
+    },
     // 查看详情
     Godetails (row) {
       this.$refs.addCommodity.show(row.productId)
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index 54d73a2..0e200a7 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -68,7 +68,6 @@
 
             </template>
           </el-table-column>
-          </el-table-column>
           <el-table-column label="合同类型">
             <template slot-scope="scope">
               {{scope.row.contractType}}
diff --git a/ceres-uniapp-master/components/canvasShow/basics/banner.vue b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
index 69b3d0d..f98612a 100644
--- a/ceres-uniapp-master/components/canvasShow/basics/banner.vue
+++ b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="banner" :class="'terminal' + terminal">
     <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange">
-      <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('+ item.imageUrl +')'}"  @click="jumpLink(item.jumpUrl)">
-        <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src="item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
+      <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('+$hostUrl+ item.imageUrl +')'}"  @click="jumpLink(item.jumpUrl)">
+        <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src=" $hostUrl+ item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
       </swiper-item>
     </swiper>
     <view class="swiper-dots" v-if="bannerList && bannerList.length > 1">
@@ -41,7 +41,7 @@
 			pageSize: 10,
 			}
 		NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => {
-			console.log('11111111111111',res)
+			
 			this.bannerList  = res.data.content
 			
 		})
diff --git a/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue b/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
index 09c425e..5eaa415 100644
--- a/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
+++ b/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
@@ -120,8 +120,8 @@
 <script>
 // import comComponentMap from './componentMap'
 
-import comBanner from '@/components/canvasShow/basics/banner'
-import comText from '@/components/canvasShow/basics/text'
+import comBanner from '@/components/canvasShow/basics/banner.vue'
+import comText from '@/components/canvasShow/basics/text.vue'
 import comImageText from '@/components/canvasShow/basics/imageText'
 import comBrandList from '@/components/canvasShow/basics/brandList'
 import comCategoryList from '@/components/canvasShow/basics/categoryList'
diff --git a/ceres-uniapp-master/components/canvasShow/config/api.js b/ceres-uniapp-master/components/canvasShow/config/api.js
index 147d3fa..48383ad 100644
--- a/ceres-uniapp-master/components/canvasShow/config/api.js
+++ b/ceres-uniapp-master/components/canvasShow/config/api.js
@@ -2,9 +2,9 @@
 
 // 获取当前环境变量 true => 生产环境 false => 开发环境
 // const BASEURL = process.env.VUE_APP_DOMAIN_PREFIX
-// const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://8.130.38.56:8027/api' : 'http://8.130.38.56:8027/api'
-const BASEURL = (process.env.NODE_ENV === 'production') ? 'https://jy.scjysm.asia:18086/meserver/api' : 'https://jy.scjysm.asia:18086/meserver/api'
-// const BASEURL = (process.env.NODE_ENV === 'production') ? 'http://127.0.0.1:9007' : 'http://127.0.0.1:9007'
+// const BASEURL = (process.env.NODE_ENV === 'production') ? 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' : 'http://10.0.0.51/api'
+const BASEURL = (process.env.NODE_ENV === 'production') ? 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' : 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
+
 
 
 export const api = {
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index e85d54b..1b1adda 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -1,15 +1,8 @@
 
-// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server'
-// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api'
-// const DOMAIN_PREFIXPING = 'http://192.168.2.7:9003' 
-// const DOMAIN_PREFIX = 'http://192.168.2.7:9007'
-
-
-
 const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-// const DOMAIN_PREFIXPING = 'http://192.168.2.225:9003' 
-// const DOMAIN_PREFIX = 'http://192.168.2.225:9007'
+// const DOMAIN_PREFIXPING = 'http://10.0.0.51:9003' 
+// const DOMAIN_PREFIX = 'http://10.0.0.51:9007'
 // const host = `${window.location.protocol}//${window.location.host}`
 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
@@ -47,8 +40,8 @@ const TERMINAL = 1
 module.exports = {
 	terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
 	SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/settled-merchant', //商家入驻链接
-	// shareLink: DOMAIN_PREFIX + '/h5', // 分享地址
-	shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
+	shareLink: DOMAIN_PREFIX + '/h5', // 分享地址
+	// shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
 	
 
 	//登录注册
diff --git a/ceres-uniapp-master/main.js b/ceres-uniapp-master/main.js
index 177c696..2f3971b 100644
--- a/ceres-uniapp-master/main.js
+++ b/ceres-uniapp-master/main.js
@@ -9,8 +9,17 @@ Vue.config.productionTip = false
 import store from './store'
 import _ from 'lodash'
 
-import {jump,jumpToTabbar,goBack,getJumpParam} from './utils/jumpUtil'
-import {encrypt,decrypt,decryptall} from './utils/jiami.js'
+import {
+	jump,
+	jumpToTabbar,
+	goBack,
+	getJumpParam
+} from './utils/jumpUtil'
+import {
+	encrypt,
+	decrypt,
+	decryptall
+} from './utils/jiami.js'
 Vue.prototype.$store = store
 Vue.prototype.$lodash = _
 Vue.prototype.$jump = jump
@@ -20,11 +29,19 @@ Vue.prototype.$getJumpParam = getJumpParam
 Vue.prototype.$encrypt = encrypt;
 Vue.prototype.$decrypt = decrypt;
 Vue.prototype.$decryptall = decryptall;
-Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cdwlMall`
+// Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cdwlMall`
+const host = window.location.host;
+Vue.prototype.$hostUrl = `https://jy.scjysm.asia:18086/cdwlMall`
+if (host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528' || host ===
+	'192.168.31.45:9528') {
+	Vue.prototype.$baseURL = 'https://jy.scjysm.asia:18086/cdwlMall'
+} else {
+	Vue.prototype.$baseURL = `${window.location.protocol}//${window.location.host}/cdwlMall`
+}
 App.mpType = 'app'
 
 const app = new Vue({
-    ...App
+	...App
 })
 console.log(store)
-app.$mount()
+app.$mount()
\ No newline at end of file
diff --git a/ceres-uniapp-master/pages/tabbar/cart/index.vue b/ceres-uniapp-master/pages/tabbar/cart/index.vue
index c95099c..5154bed 100644
--- a/ceres-uniapp-master/pages/tabbar/cart/index.vue
+++ b/ceres-uniapp-master/pages/tabbar/cart/index.vue
@@ -11,13 +11,19 @@
     <!-- 购物车 -->
     <view class="u-skeleton">
       <view v-if="!isEmpty">
-        <u-sticky bg-color="#fff">
+        <u-sticky bg-color="#fff" offsetTop="-84">
           <view class="cart-bg  u-skeleton-fillet">
             <view class="cart-num-box">
               <!-- <image
-                  class="  u-skeleton-fillet"
+                  class="u-skeleton-fillet"
                   src="@/static/logoTop.png"
               ></image> -->
+			  <view>
+			    <text class="num-box u-skeleton-fillet">共
+			      <text class="num">{{ settleAccountsObj.allNum }}</text>
+			      件宝贝
+			    </text>
+			  </view>
               <text
                   class="btn-box "
                   @click="showManage = !showManage"
@@ -31,12 +37,7 @@
               >完成
               </text>
             </view>
-            <view>
-              <text class="num-box u-skeleton-fillet">共
-                <text class="num">{{ settleAccountsObj.allNum }}</text>
-                件宝贝
-              </text>
-            </view>
+            
           </view>
         </u-sticky>
         <view class="cart-list-box">
@@ -279,11 +280,18 @@ export default {
   onShow() {
     this.isFirstComeIn = true
     this.loading = true
-    this.userInfo = uni.getStorageSync('storage_key')
+	if (uni.getStorageSync('storage_key')) {
+		this.userInfo = uni.getStorageSync('storage_key')
+		
+	}else{
+		this.$jump('../../../pages_category_page2/userModule/login')
+		return
+	}
     cacheKey = this.userInfo.buyerUserId + "cart_info"
     this.dataList = defaultCartList
     this.isEmpty = false
     this.getDataList()
+
   },
   methods: {
     /**
diff --git a/ceres-uniapp-master/pages/tabbar/category/index.vue b/ceres-uniapp-master/pages/tabbar/category/index.vue
index ca3fd3f..79f778d 100644
--- a/ceres-uniapp-master/pages/tabbar/category/index.vue
+++ b/ceres-uniapp-master/pages/tabbar/category/index.vue
@@ -57,7 +57,7 @@
 							@click="goodsDateils(groupItem.shopId,groupItem.productId,groupItem.skuId)">
 
 							<view>
-								<image :src="groupItem.image" mode=""
+								<image :src="$baseURL+groupItem.image" mode=""
 									style="width:240rpx;height: 240rpx;margin-right: 10rpx;border-radius: 10rpx;">
 								</image>
 								<view class="tableTitle" style="-webkit-line-clamp: 1;display: -webkit-box;-webkit-box-orient: vertical;overflow: hidden;text-overflow: ellipsis;">{{groupItem.productName}}</view>
diff --git a/ceres-uniapp-master/pages/tabbar/index/index.vue b/ceres-uniapp-master/pages/tabbar/index/index.vue
index 1bd66db..7717e7f 100644
--- a/ceres-uniapp-master/pages/tabbar/index/index.vue
+++ b/ceres-uniapp-master/pages/tabbar/index/index.vue
@@ -162,6 +162,7 @@ export default {
     canvasGet() {
       var _this = this
       var apiUrl = api.getCanvas + '?terminal=' + this.terminal + '&type=' + this.typeId
+	  
       if (this.shopId) {
         apiUrl += '&shopId=' + this.shopId
       }
@@ -175,6 +176,7 @@ export default {
       // })
       NET.request(apiUrl, {}, 'GET').then(res => {
         if (JSON.stringify(res.data) !== '{}') {
+			console.log(res.data.json)
           var componentsData = JSON.parse(res.data.json)
           this.componentsData = componentsData
         }
@@ -257,7 +259,7 @@ export default {
   .topBox {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-end;
     width: 100%;
   }
 
diff --git a/ceres-uniapp-master/pages/tabbar/user/index.vue b/ceres-uniapp-master/pages/tabbar/user/index.vue
index ce00120..025ada3 100644
--- a/ceres-uniapp-master/pages/tabbar/user/index.vue
+++ b/ceres-uniapp-master/pages/tabbar/user/index.vue
@@ -157,10 +157,15 @@
 		},
 		onShow() {
 			this.isFirstComeIn = true
+			
 			if (uni.getStorageSync('storage_key')) {
+				
 				this.cacheUserItem = uni.getStorageSync('storage_key');
+				this.handleGetUser()
+			}else{
+				this.$jump('../../../pages_category_page2/userModule/login')
 			}
-			this.handleGetUser()
+			
 		},
 		methods: {
 			/**
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index e54bec4..11709e3 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -457,7 +457,7 @@
 			"path": "rentPay/webView",
 			"style": {
 				"navigationBarBackgroundColor": "#FFFFFF",
-				"navigationBarTitleText": "跳转"
+				"navigationBarTitleText": "支付中"
 			}
 		}
 		]	
diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue
index b496267..0f84850 100644
--- a/lvdao-miniapp/pages/message/message.vue
+++ b/lvdao-miniapp/pages/message/message.vue
@@ -24,14 +24,15 @@
 						<view class="title">
 							<text>通知消息</text>
 						</view>
+						
 						<view class="describe">
-							<text>{{tableList[0].content}}</text>
+							<text>{{tableList[0]?tableList[0].content:''}}</text>
 						</view>
 					</view>
 				</view>
 				<view class="more">
 					<!-- <view class="more-num">{{tableList.length}}</view> -->
-					<view class="icon-more">{{formatDateTime(tableList[0].createdAt)}}</view>
+					<view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view>
 				</view>
 			</view>
 			<!-- <view class="list">
@@ -275,6 +276,7 @@
 			},
 			getALL(){
 					this.$http.sendRequest('/cereMessageNotification/queryByPage','POST',this.pagesize,1).then(res => {
+						
 						 this.tableList =res.data.data.content 
 					})
 						},
diff --git a/lvdao-miniapp/pagesA/rentPay/goPay.vue b/lvdao-miniapp/pagesA/rentPay/goPay.vue
index d30db92..d640e9d 100644
--- a/lvdao-miniapp/pagesA/rentPay/goPay.vue
+++ b/lvdao-miniapp/pagesA/rentPay/goPay.vue
@@ -52,16 +52,21 @@
 			},
 				methods: {
 					submit(){
-						console.log(this.receivedMsg)
 						
-						let obj = [{
-							orderId:this.receivedMsg[0].tenementOrder,
-							money:this.receivedMsg[0].paymentAmount,
-						}]
-						this.$http.sendRequest('/order/rentAggregatePayment','POST',obj,3).then(res => {
+						let arr = []
+						this.receivedMsg.map(item=>{
+							let obj = {
+								orderId:item.tenementOrder,
+								money:item.paymentAmount,
+							}
+							arr.push(obj)
+						})
+						
+						// return
+						this.$http.sendRequest('/order/rentAggregatePayment','POST',arr,3).then(res => {
 							console.log(JSON.parse(res.data.data).data.codeUrl)
 							 if(res.data.data){
-								 uni.navigateTo({
+								 uni.redirectTo({
 								 	url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
 								 })
 							 }
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPay.vue b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
index 95b45eb..273e979 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPay.vue
+++ b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
@@ -66,8 +66,8 @@
 				payNum: 1,
 				dayMsg: '',
 				show: false,
-				payAll: 0,
-				yingPayAll: 0,
+				payAll: 0.00,
+				yingPayAll: 0.00,
 				value: '',
 				list1: [],
 				checked: [],
@@ -95,21 +95,26 @@
 					url: '/pages/login/login'
 				})
 			} else {
-
+				
+				this.$http.sendRequest('/order/refundToRent', 'POST', {
+				orderId:'202502101739156798173156287',type:2
+				},3).then(res => {
+					
+				})
 				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
 					pageSize: 10,
 					pageNumber: 0,
 					phone: uni.getStorageSync('user').phone
 				}).then(res => {
-
+					
 					if (res.data.code == '20004' || res.data.code == '20003') {
 						uni.navigateTo({
 							url: '/pages/login/login'
 						})
 					} else {
-
+						this.relatedMerchants = res.data.data.content[0].id
 						this.$http.sendRequest('/cerePropertyOrder/queryByName', 'POST', {
-							relatedMerchants: res.data.data.content[0].id
+							relatedMerchants: res.data.data.content[0].id,
 						}, 1).then(res => {
 							if (res.data.data.length > 0) {
 								const listNew = []
@@ -136,6 +141,7 @@
 								res.data.data[0].cerePropertyOrderList.map(item => {
 									if (item.payState == 0) {
 										this.yingPayAll += item.paymentAmount
+										this.yingPayAll  = this.roundUpToTwoDecimals(this.yingPayAll)
 										this.payNum = item.payType
 										this.dayMsg = item.payDay
 										const zujin = {
@@ -148,8 +154,6 @@
 									}
 								})
 								this.recordList = redList
-
-
 							}
 						})
 					}
@@ -158,6 +162,9 @@
 
 		},
 		methods: {
+			 roundUpToTwoDecimals(num) {
+			    return Math.ceil(num * 100) / 100;
+			},
 			quanxuan(e) {
 				this.payAll = 0
 				const allTrue = this.recordList.every(item => item.gouxuan)
@@ -179,8 +186,10 @@
 			xuanAll(item, e) {
 				if (e.value) {
 					this.payAll += item.paymentAmount
+					this.payAll  = this.roundUpToTwoDecimals(this.payAll)
 				} else {
 					this.payAll -= item.paymentAmount
+					this.payAll  = this.roundUpToTwoDecimals(this.payAll)
 				}
 			},
 			recordXq(item) {
@@ -190,9 +199,10 @@
 				})
 			},
 			toDetail() {
+				
 				const msg = JSON.stringify(this.list1[this.ListIndex])
 				uni.navigateTo({
-					url: `/pagesA/rentPay/rentPayDetails?msg=${msg}`
+					url: `/pagesA/rentPay/rentPayDetails?msg=${msg}&merchants=${this.relatedMerchants}`
 				})
 			},
 			joinShow() {
@@ -225,15 +235,19 @@
 				this.yingPayAll = 0
 				this.payAll = 0
 				this.list1[index].list.map(item => {
-					this.yingPayAll += item.paymentAmount
-					this.payNum = item.payType
-					this.dayMsg = item.payDay
-					const zujin = {
-						...item,
-						showItem: false,
-						gouxuan: false,
+					if (item.payState == 0) {
+						this.yingPayAll += item.paymentAmount
+						this.yingPayAll  = this.roundUpToTwoDecimals(this.yingPayAll)
+						this.payNum = item.payType
+						this.dayMsg = item.payDay
+						const zujin = {
+							...item,
+							showItem: false,
+							gouxuan: false,
+						}
+						redList.push(zujin)
 					}
-					redList.push(zujin)
+					
 				})
 				this.recordList = redList
 
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss
index 55a26bf..cb8c8f4 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss
+++ b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss
@@ -65,4 +65,12 @@
 			border-bottom: unset;
 		}
 	}
+}
+.nonemsg{
+	color: #0FBB59;
+	font-size: 18px;
+	width: 100%;
+	margin-top: 10%;
+	text-align: center;
+	
 }
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
index 5b17300..c73001e 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
+++ b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
@@ -10,21 +10,24 @@
 		<view class="record-list">
 			<view class="record-item" v-for="(item, index) in dataList" :key="index" >
 				<view class="info-title">
-					<view class="title">{{item.tenementOrderDate}}</view>
-					<!-- <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{orderPay}}</view></view> -->
+					<!-- <view class="title">{{formatDate(item.tenementOrderDate)}}</view> -->
+					<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.dingPay}}</view></view>
 				</view>
-				<view class="info-items">
+				<view class="info-items" v-for="(value, ids) in item.ziList">
 					<view class="info-item">
-						<view class="left title">{{item.tenementOrder}}</view>
-						<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.paymentAmount}}</view></view>
+						<view class="left title">{{value.tenementOrderParent==''?value.tenementOrder:value.tenementOrderParent}}</view>
+						<view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{value.paymentAmount}}</view></view>
 					</view>
 					<view class="info-item">
-						<view class="left" style="color: #0FBB59;">支付成功</view>
-						<view class="right" style="color: #8A8A8A;">{{item.paymentTime}}</view>
+						<view class="left" style="color: #0FBB59;">{{value.payState==1?'支付成功':''}}</view>
+						<view class="right" style="color: #8A8A8A;">{{formatDateTime(value.paymentTime)}}</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<view v-if="dataList.length === 0" class="nonemsg">
+			暂无数据
+		</view>
 	</view>
 </template>
 
@@ -34,38 +37,142 @@
 			return {
 				show: false,
 				dataList: [],
-				orderPay:0,
 				allPay:0,
 				pageIndex:{
 					time:''
-				}
+				},
+				merchants:''
 			}
 		},
-			onShow() {
+			onShow(){
 			this.pageIndex.time = this.getCurrentYear()
 			},
 			  onLoad(options) {
-			   if(options.msg){
-				   this.orderPay = 0
+			   if(options.msg && options.merchants){
 				   this.allPay = 0
 				   let receivedMsg = JSON.parse(options.msg)
-				   
-				   receivedMsg.list.map(item=>{
-					   this.orderPay+=item.paymentAmount
-					    this.allPay+=item.paymentAmount
-				   })
-				  this.dataList = receivedMsg.list
+				   this.merchants  = options.merchants
+				   this.getAll(receivedMsg.list)
 			   }
 			  },
 		methods: {
+			getAll(receivedMsg){
+					let totalPay= 0
+					const redList = []
+					  // 用于存储 tenementOrderParent 相同的项
+					  const groupedItems = {};
+					  // 遍历 receivedMsg.list 数组
+					  receivedMsg.forEach(item => {
+										   if(item.payState ==1){
+											     totalPay += item.paymentAmount
+											   if (item.tenementOrderParent === '') {
+											       // 如果 tenementOrderParent 为空，添加 dingPay 字段并添加到 redList
+											       let newItem = { ...item,ziList:[], dingPay: item.paymentAmount };
+												   newItem.ziList.push(item)
+											       redList.push(newItem);
+											   } else {
+											       // 如果 tenementOrderParent 不为空，将相同 tenementOrderParent 的项分组
+											       if (!groupedItems[item.tenementOrderParent]) {
+											           groupedItems[item.tenementOrderParent] = {
+											               ziList: [],
+											               dingPay: 0
+											           };
+											       }
+											       groupedItems[item.tenementOrderParent].ziList.push(item);
+											       groupedItems[item.tenementOrderParent].dingPay += item.paymentAmount;
+												   groupedItems[item.tenementOrderParent].paymentTime = item.paymentTime;
+												   groupedItems[item.tenementOrderParent].payDay = item.payDay;
+												   groupedItems[item.tenementOrderParent].payState = item.payState;
+											   }
+										   }
+					   
+					  });
+					  // 将分组后的对象添加到 redList
+					  for (const key in groupedItems) {
+					      redList.push({
+					          tenementOrderParent: key,
+					          ...groupedItems[key]
+					      });
+					  }
+					  
+					//   receivedMsg.list.map(item=>{
+										// let obj ={
+										// 	...item,
+										// 	dingPay:0,
+										// 	ziList:[]
+										// }
+										//    if (item.payState == 1) {
+										// 	 obj.ziList.push(item)
+										// 	 if(item.tenementOrderParent ){
+												 
+										// 	 }
+										// 	 obj.dingPay +=item.paymentAmount
+										// 	 this.orderPay+=item.paymentAmount
+										// 	  this.allPay+=item.paymentAmount
+										// 	  redList.push(obj)
+										//    }
+										   
+					//   })
+					     this.allPay = totalPay;
+					 this.dataList = redList
+					 
+			},
 			getCurrentYear() {
 			    const year = new Date().getFullYear();
 			    return `${year}`;
 			},
 			confirm(e){
-				
 				this.pageIndex.time =  e.year
-			}
+			  
+  const { firstDay, lastDay } = this.getYearFirstAndLastDay(e.year)
+				this.$http.sendRequest('/cerePropertyOrder/queryByName', 'POST', {
+					relatedMerchants:this.merchants,
+					paymentTimeStart:firstDay,
+					paymentTimeEnd:lastDay
+				}, 1).then(res => {
+					if (res.data.data.length > 0) {
+						
+						this.getAll(res.data.data[0].cerePropertyOrderList)
+					}else{
+						this.dataList=[]
+						this.allPay = 0
+					}
+					})
+			},
+			getYearFirstAndLastDay(year) {
+				console.log(year)
+			    const firstDay = new Date(year, 0, 1);
+			       const lastDay = new Date(year, 11, 31);
+				   console.log(firstDay.toISOString().split('T'))
+			       return {
+			           firstDay: firstDay.toISOString().split('T')[0],
+			           lastDay: lastDay.toISOString().split('T')[0]
+			       }
+			},
+			formatDateTime(dateTimeStr) {
+			    // 创建 Date 对象
+			    const date = new Date(dateTimeStr);
+			    // 获取月份，由于 getMonth() 返回值从 0 开始，所以要加 1，并确保为两位数字
+			    const month = String(date.getMonth() + 1).padStart(2, '0');
+			    // 获取日期，并确保为两位数字
+			    const day = String(date.getDate()).padStart(2, '0');
+			    // 获取小时，并确保为两位数字
+			    const hours = String(date.getHours()).padStart(2, '0');
+			    // 获取分钟，并确保为两位数字
+			    const minutes = String(date.getMinutes()).padStart(2, '0');
+			
+			    // 按照所需格式拼接并返回结果
+			    return `${month}.${day} ${hours}:${minutes}`;
+			},
+			formatDate(dateStr) {
+			    // 使用 split 方法将日期字符串按 - 分割成数组
+			    const [year, month, day] = dateStr.split('-');
+			    // 将 month 和 day 转换为数字，去除可能存在的前导零
+			    const formattedMonth = parseInt(month, 10);
+			    const formattedDay = parseInt(day, 10);
+			    // 按照目标格式拼接字符串
+			    return `${formattedMonth}月${formattedDay}号`;
+			},
 		}
 	}
 </script>
diff --git a/lvdao-miniapp/pagesA/rentPay/webView.vue b/lvdao-miniapp/pagesA/rentPay/webView.vue
index 535f98c..1240691 100644
--- a/lvdao-miniapp/pagesA/rentPay/webView.vue
+++ b/lvdao-miniapp/pagesA/rentPay/webView.vue
@@ -11,15 +11,20 @@
 			url:'https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F'
 			}
 	},
-	
+	onBackPress() {
+	    // 拦截返回事件
+	    uni.redirectTo({
+	      url: '/pagesA/rentPay/rentPay'
+	    });
+	    return true; 
+	  },
 	  onLoad(options) {
 			 if(options.urls){
 				 this.url = options.urls
 			 }
 	  },
 	  mounted() {
-	    // 可选：在组件挂载后进行一些验证或处理
-	    console.log('加载的网址:', this.webUrl);
+
 	  }
 	}
 </script>
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 2c62a9f..778963d 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -17,25 +17,27 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://172.16.61.125:9003/' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
 		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
+		bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
 
-		bases = 'http://192.168.2.107:9003' + url;
+		// bases = 'http://10.0.0.51:9003' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
-		// bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
+		
 		
 		
 	}else if(baseUrl == 3){
-		bases = 'http://192.168.2.107:9007' + url;
+		bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
+		// bases = 'http://192.168.2.107:9007' + url;
+		// bases = 'http://10.0.0.51:9007' + url;
 		
 	}else{
 		// bases = 'http://172.16.61.125:9004/' + url;
 		// bases = 'http://172.16.61.48/business-server' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
-		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
+		bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
 		
-		bases = 'http://192.168.2.107:9004' + url;
+		// bases = 'http://10.0.0.51:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
-		// bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
+		
 	}
 	var token = uni.getStorageSync('token') || '';
 	var shopId = uni.getStorageSync('shopId') || '';
diff --git a/merchant-web-master/src/api/commodityLease.js b/merchant-web-master/src/api/commodityLease.js
new file mode 100644
index 0000000..4c41322
--- /dev/null
+++ b/merchant-web-master/src/api/commodityLease.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+// 上传合同
+
+export function miniioupload(data) {
+  return request({
+    url: '/miniio/upload',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
diff --git a/merchant-web-master/src/assets/images/cover.svg b/merchant-web-master/src/assets/images/cover.svg
new file mode 100644
index 0000000..7c89a09
--- /dev/null
+++ b/merchant-web-master/src/assets/images/cover.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><defs><style>.a,.b,.c{fill:none;}.b,.c{stroke:rgba(255,255,255,0.9);stroke-linecap:round;stroke-linejoin:round;}.b{stroke-miterlimit:10;}</style></defs><g transform="translate(-530 -1091)"><g transform="translate(-14 -55)"><rect class="a" width="16" height="16" transform="translate(544 1146)"/></g><g transform="translate(525.727 1086.896)"><path class="b" d="M17.153,13.834v6.622a.7.7,0,0,1-.7.7H6.7a.7.7,0,0,1-.7-.7V10.7a.7.7,0,0,1,.7-.7h6.4" transform="translate(0 -2.739)"/><path class="b" d="M12,24.17l2.091-2.8,1.046,1.046,1.22-1.917,2.614,3.67Z" transform="translate(-3.909 -9.579)"/></g><path class="c" d="M28.726,7.59l1.3,1.308,2.5-2.5" transform="translate(511.984 1087.283)"/></g></svg>
\ No newline at end of file
diff --git a/merchant-web-master/src/assets/images/fengmian.png b/merchant-web-master/src/assets/images/fengmian.png
new file mode 100644
index 0000000..4259516
--- /dev/null
+++ b/merchant-web-master/src/assets/images/fengmian.png
diff --git a/merchant-web-master/src/assets/images/logo2.png b/merchant-web-master/src/assets/images/logo2.png
new file mode 100644
index 0000000..f506d11
--- /dev/null
+++ b/merchant-web-master/src/assets/images/logo2.png
diff --git a/merchant-web-master/src/components/BaseImage/index.vue b/merchant-web-master/src/components/BaseImage/index.vue
new file mode 100644
index 0000000..b29de64
--- /dev/null
+++ b/merchant-web-master/src/components/BaseImage/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <!-- 支持官方文档Attributes、event -->
+  <div class="base-img-box">
+    <el-image
+      class="base-img"
+
+      :lazy="false"
+      fit="cover"
+      :src="realSrc"
+      :preview-teleported="true"
+      :preview-src-list="isPreview ? [realSrc] : null"
+      ref="baseImgRef"
+    />
+    <div class="base-img-mask-layer" v-if="isSetCover">
+      <div class="mask-layer-box">
+        <div class="mask-layer-item" @click="handleLook">
+          <el-icon size="20" class="el-icon-zoom-in" style="color:#fff"></el-icon>
+        </div>
+        <div class="mask-layer-item" @click="handleDelete">
+          <el-icon size="20" class="el-icon-delete" style="color:#fff"></el-icon>
+        </div>
+        <div
+          class="mask-layer-item"
+          @click="handleSetCover"
+          v-if="forIndex !== onforIndex"
+        >
+          <img
+            class="mask-layer-item-icon"
+            src="@/assets/images/cover.svg"
+            alt=""
+          />
+        </div>
+      </div>
+    </div>
+    <div class="fengmian" v-if="forIndex === onforIndex && isSetCover">
+      <img src="@/assets/images/fengmian.png" alt="" />
+    </div>
+  </div>
+</template>
+
+<script>
+// import { reqFileFullUrl } from '@/api/commonApi/file';
+// import envConfig from '@/utils/envConfig';
+// import { toFullUrl } from '@/utils/index';
+// import { ZoomIn, Delete } from '@element-plus/icons-vue';
+
+export default {
+  name: 'BaseImage',
+  props: {
+    onforIndex: {
+      type: Number,
+      default: 0,
+    },
+    src: {
+      type: String,
+      required: true,
+    },
+    // 获取完整预览路径
+    getFull: {
+      type: Boolean,
+      default: true,
+    },
+    // 是否开启图片预览
+    isPreview: {
+      type: Boolean,
+      default: true,
+    },
+    // 是否开启图片预览
+    code: {
+      type: Number,
+      default: 5000,
+    },
+    // 资源类型  sys：系统资源  business: 业务资源  用于区分上传路径
+    resourceType: {
+      type: String,
+      default: 'business',
+    },
+    isSetCover: {
+      type: Boolean,
+      default: false,
+    },
+    forIndex: {
+      type: Number,
+      default: 9999,
+    },
+  },
+  data() {
+    return {
+      accessUrl: '',
+      baseImgRef: null,
+    };
+  },
+  computed: {
+    realSrc() {
+      return this.accessUrl;
+    },
+  },
+  watch: {
+    src: {
+      immediate: true,
+      handler(newValue) {
+        if (newValue && this.getFull) {
+          this.getFileFullUrl();
+        }
+      },
+    },
+  },
+  methods: {
+    getFileFullUrl() {
+      if (!this.src) return;
+      if (process.env.NODE_ENV == 'development') {
+        this.accessUrl = this.$baseURL + this.src; //开发环境
+      } else {
+        this.accessUrl = this.$baseURL + this.src; //发布环境
+      }
+    },
+    handleLook() {
+      this.$refs.baseImgRef.$el.children[0].click();
+    },
+    handleDelete() {
+      this.$emit('handleDelete');
+    },
+    handleSetCover() {
+      this.$emit('handleSetCover');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.base-img-box {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  .base-img {
+    width: 100%;
+    height: 100%;
+  }
+  .base-img-mask-layer {
+    display: none;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    .mask-layer-box {
+      background-color: rgba($color: #000000, $alpha: 0.5);
+      width: 100%;
+      height: 100%;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      .mask-layer-item {
+        position: relative;
+        z-index: 2;
+        cursor: pointer;
+        .mask-layer-item-icon {
+          width: 20px;
+          height: 20px;
+        }
+      }
+    }
+  }
+
+  &:hover .base-img-mask-layer {
+    display: block;
+  }
+  .fengmian {
+    position: absolute;
+    top: 6px;
+    right: 9px;
+    img {
+      width: 31px;
+      height: 36px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/merchant-web-master/src/components/ImageUpload/index.vue b/merchant-web-master/src/components/ImageUpload/index.vue
new file mode 100644
index 0000000..212afb3
--- /dev/null
+++ b/merchant-web-master/src/components/ImageUpload/index.vue
@@ -0,0 +1,439 @@
+<template>
+  <div class="upload-container">
+    <div class="tips" v-if="!options.disabled">
+      请上传小于{{ options.limitSize }}M，格式为{{
+        options.accept
+      }}格式的图片，最多可上传{{ options.limit }}张
+    </div>
+    <div class="card-list-box">
+      <div v-for="(file, i) in localValue" :key="'upload-BaseImage' + i" class="card-item-box">
+        <BaseImage :src="file.imgPath" fit="contain" class="card-img" :code="options.reqParams.code"
+          :filePath="filePath" @handleDelete="handleDeleteImg(file, i)"
+          @handleSetCover="handleSetCover(file, i)" :isSetCover="cmpOption.isSetCover" :forIndex="i" :onforIndex="onforIndex"/>
+        <div v-show="!options.disabled && !cmpOption.isSetCover" title="删除" class="delete-box"
+          @click="handleDeleteImg(file, i)">
+          <i class="el-icon-close"></i>
+        </div>
+      </div>
+      <div v-for="(file, i) in reactiveData.filesIng" :key="i" class="card-item-box">
+        <div v-show="reactiveData.status === 'uploading'" class="uploading-box flex-col-center-center">
+          <el-progress v-if="reactiveData.lengthComputable" type="circle" :width="50"
+            :percentage="uploadPercentage()" />
+          <template v-else>
+            <i class="el-icon-loading"></i>
+            {{ reactiveData.message }}
+          </template>
+        </div>
+      </div>
+      <div style="position: relative;">
+        <input :accept="options.accept" style="opacity: 0;position: absolute;" :id="inputtype" ref="fileInput" type="file" :multiple="true"
+        @change="handleUploadFile" />
+        <div v-if="
+            localValue && localValue.length < options.limit && !options.disabled
+          " title="点击上传" class="card-action-box" @click="handleUpload">
+          <i class="el-icon-plus"></i>
+          <span class="card-action-text">点击上传图片</span>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    miniioupload
+  } from '@/api/commodityLease.js'
+  import BaseImage from '@/components/BaseImage/index.vue';
+
+  export default {
+    components: {
+      BaseImage,
+    },
+    name: 'BaseUpload',
+    props: {
+      value: {
+        type: String,
+        default: '',
+      },
+      cmpOption: {
+        type: Object,
+        default: () => ({
+          disabled: false,
+          isSetCover: true,
+        }),
+      },
+      filePath: {
+        type: String,
+        default: 'other',
+      },
+      inputtype: {
+        type: String,
+        default: '',
+      },
+      limit: {
+        type: Number,
+        default: 10,
+      },
+    },
+    data() {
+      return {
+        fileList:[],
+        onforIndex:0,
+        localValue: [],
+        options: {
+          limitSize: 10,
+          accept: '.bmp,.jpg,.jpeg,.png',
+          multiple: false,
+          limit: 10,
+          disabled: false,
+          field: 'files',
+          reqParams: {
+            code: 2000
+          },
+        },
+        reactiveData: {
+          files: [],
+          filesIng: [],
+          status: 'uploading',
+          message: '上传中...',
+          total: 0,
+          loaded: 0,
+          lengthComputable: false,
+        },
+      };
+    },
+    watch: {
+      limit: {
+        handler() {
+          this.options.limit= this.limit
+        },
+        immediate: true,
+      },
+      cmpOption: {
+        handler() {
+          this.setOptions();
+        },
+        immediate: true,
+      },
+      value: {
+        handler(val) {
+          console.log('val',val)
+          if (val && val !='') {
+            // 首先将值转为数组
+            const list = Array.isArray(val) ? val : this.value.split(',')
+            // 然后将数组转为对象数组
+            this.fileList = list
+            this.localValue = list.map(item => {
+              if (typeof item === 'string') {
+                item = {
+                  imgPath: item,
+                }
+              }
+              console.log('1111111111111111',item)
+              return item
+            })
+          } else {
+            console.log('22222222222222222222')
+            this.localValue = []
+            this.fileList = []
+            return []
+          }
+        },
+        immediate: true,
+      },
+    },
+    methods: {
+      async handleUploadFile(value) {
+        const files = value.target.files
+        if (!this.filesCheck(files)) {
+          return;
+        }
+        this.reactiveData.filesIng = new Array(files.length);
+        this.reactiveData.lengthComputable = false;
+        this.reactiveData.status = 'uploading';
+        this.reactiveData.total = 0;
+        this.reactiveData.loaded = 0;
+        let c1 =  await this.asyncFileUpload(Array.from(files));
+        let list = []
+        for (let i = 0; i < c1.length; i++) {
+          let info = {
+            imgPath:c1[i]
+          }
+          list.push(info)
+        }
+        this.localValue = [...this.localValue,...list]
+        this.reactiveData.filesIng = []
+        this.fileList = []
+        for (let i = 0; i < this.localValue.length; i++) {
+          this.fileList.push(this.localValue[i].imgPath)
+        }
+        let urlstr = this.fileList.join(',')
+        this.$emit('changimg',urlstr)
+        
+      },
+      setOptions() {
+        this.options = {
+          ...this.options,
+          ...this.cmpOption
+        };
+      },
+      uploadPercentage() {
+        return parseInt(String(this.reactiveData.loaded / (this.reactiveData.total / 100)));
+      },
+      handleUpload() {
+        const input = document.querySelector('#'+this.inputtype)
+        input.click()
+      },
+      async asyncFileUpload(formDataArray) {
+     
+        try {
+          // 初始化上传状态
+          this.reactiveData.status = 'uploading';
+          this.reactiveData.filesIng = formDataArray.map(() => ({
+            status: 'pending',
+            loaded: 0,
+            total: 0
+          }));
+          this.reactiveData.lengthComputable = false;
+          this.reactiveData.total = 0;
+          this.reactiveData.loaded = 0;
+          let list = []
+          // 循环遍历每个文件并进行上传
+          for (let i = 0; i < formDataArray.length; i++) {
+            const fileData = formDataArray[i];
+
+            // 创建一个新的 FormData 对象
+            let fd = new FormData();
+            fd.append('file', fileData); // 假设 formData 包含文件
+            fd.append('filePath', this.filePath);
+
+            // 更新当前文件的上传状态
+            this.reactiveData.filesIng[i].status = 'uploading';
+
+            // 调用 miniioupload 方法并等待响应
+            const res = await miniioupload(fd);
+            list.push(res.data)
+            // 处理成功响应
+            this.reactiveData.filesIng[i].status = 'success';
+       
+          }
+
+          // 所有文件上传完成
+          this.reactiveData.status = 'success';
+          this.$message.success('文件上传成功');
+ 
+          return list
+        } catch (error) {
+          // 处理错误
+          console.error('上传失败:', error);
+          this.reactiveData.status = 'error';
+          this.reactiveData.filesIng = formDataArray.map(() => ({
+            status: 'error',
+            loaded: 0,
+            total: 0
+          }));
+          this.$message.error('上传失败');
+          return []
+        }
+      },
+      async handleDeleteImg(file, i) {
+        console.error('1111111111111111111',file, i)
+        let modelValue_ = this.localValue.filter((value, index) => index != i);
+        this.localValue = modelValue_
+        this.fileList = []
+        for (let i = 0; i < this.localValue.length; i++) {
+          this.fileList.push(this.localValue[i].imgPath)
+        }
+        let urlstr = this.fileList.join(',')
+        console.log('urlstr',urlstr)
+        this.$emit('changimg',urlstr)
+      },
+      async handleSetCover(file, i) {
+ 
+        this.onforIndex = i
+        this.$emit('changfmindex',this.onforIndex)
+      },
+      filesCheck(files) {
+        const {
+          limitSize,
+          accept,
+          limit
+        } = this.options;
+        if (this.reactiveData.files.length + files.length > limit) {
+          this.$message.error(`最多上传${limit}个文件`);
+          return false;
+        }
+        for (let index = 0; index < files.length; index++) {
+          const file = files[index];
+          if (!this.checkFileType(file)) {
+            this.$message.error(`请上传${accept}等格式`);
+            return false;
+          }
+          if (!this.checkSize(file)) {
+            this.$message.error(`文件大小不能超过 ${limitSize}MB!`);
+            return false;
+          }
+        }
+
+        return true;
+      },
+      checkSize({
+        size
+      }) {
+        return size <= this.options.limitSize * 1024 * 1024;
+      },
+      checkFileType(file) {
+     
+        let {
+          accept
+        } = this.options;
+        if (!accept || accept === '*') {
+          return true;
+        }
+        accept = accept.toLowerCase().replace(/\s/g, '');
+        const acceptTypeList = accept.split(',');
+        const fileType = file.name.match(/\.\w*$/)?.shift() ?? '';
+        return acceptTypeList.includes(fileType.toLowerCase());
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .upload-container {
+    width: 100%;
+
+    .tips {
+      color: #0006;
+      font: 14px 'Alibaba PuHuiTi 2.0-55 Regular';
+      line-height: 38px;
+    }
+
+    .action-box {
+      cursor: pointer;
+      padding-left: 10px;
+
+      .default-action {
+        color: #3f9b6a;
+      }
+    }
+
+    .card-list-box {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+
+      .card-item-box {
+        position: relative;
+        width: 112px;
+        height: 112px;
+        border: 1px dotted #dcdfe6;
+        border-radius: 2px;
+        overflow: hidden;
+        margin: 0 10px 10px 0;
+
+        .delete-box {
+          padding: 2px 5px;
+          position: absolute;
+          right: 0;
+          top: 0;
+          line-height: normal;
+          background-color: #000;
+          color: #fff;
+          border-radius: 50%;
+          transform: translate(40%, -30%);
+
+          .el-icon-close {
+            font-size: 12px;
+            transform: translate(-30%, 20%);
+          }
+        }
+      }
+
+      .card-action-box {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        width: 112px;
+        height: 112px;
+        border: 1px dashed #cdd0d6;
+        border-radius: 2px;
+        overflow: hidden;
+        // margin-bottom: 10px;
+        background-color: #fafafa;
+        cursor: pointer;
+        font-size: 12px;
+        color: #00000066;
+
+        .el-icon-plus {
+          font-size: 20px;
+        }
+
+        &:hover {
+          border-color: #3f9b6a;
+          color: #3f9b6a;
+        }
+      }
+    }
+
+    .text-list-box {
+      .text-item-box {
+        padding: 0 5px;
+        border-radius: 2px;
+        overflow: hidden;
+
+        .file-name {
+          flex: 1;
+        }
+
+        .text-icon {
+          flex-shrink: 0;
+          padding-right: 10px;
+        }
+
+        .el-icon-close {
+          cursor: pointer;
+          padding-left: 10px;
+          flex-shrink: 0;
+        }
+
+        &:hover {
+          background-color: rgba(63, 155, 106, 0.2);
+
+          .file-name {
+            color: #3f9b6a;
+          }
+        }
+
+        &:nth-child(n + 2) {
+          margin-top: 10px;
+        }
+      }
+    }
+
+    .uploading-box {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      color: #fff;
+      background-color: #c0c4cc;
+    }
+
+    .progress-box {
+      width: 100%;
+      height: 100%;
+      position: relative;
+
+      .el-progress {
+        position: absolute;
+        right: 10px;
+        top: 50%;
+        transform: translateY(-50%);
+      }
+    }
+  }
+</style>
diff --git a/merchant-web-master/src/layout/index.vue b/merchant-web-master/src/layout/index.vue
index 80986d1..d4b58a5 100644
--- a/merchant-web-master/src/layout/index.vue
+++ b/merchant-web-master/src/layout/index.vue
@@ -2,14 +2,15 @@
   <div :class="classObj" class="app-wrapper">
     <div style=" width: 100%; height: 50px; background: #3F9B6A; position: fixed;top:0;left:0;z-index:1001;display: flex;flex-wrap: wrap; margin-bottom: 1px;">
       <div style="width: 15%;margin-top: 8px;padding-left: 20px;">
-        <img src="../assets/images/log2.png" alt="" style="height: 36px; object-fit: contain;" />
+        <img src="../assets/images/logo2.png" alt="" style="height: 36px; object-fit: contain;" />
       </div>
 
-     <div style="position: absolute;top:0px;right:50px;display: flex">
-         <div style="border-radius:20px; width: 100px; height: 24px;margin-top: 15px;margin-right: 10px;background:rgba(255, 255, 255, 0.1);display: flex;flex-flow: row nowrap;justify-content: center;
-     align-items: center;"  @click="gzt">
-            <img src="../../src/assets/images/home.png" alt="" style="height: 20px;object-fit: contain;width:17px;margin-right:6px;"/>
-             <div style="color: #fff;line-height: 20px;font-size:14px">工作台</div>
+      <div style="position: absolute;top:0px;right:50px;display: flex">
+       <div style="border-radius:20px; width: 110px; height: 30px;margin-top: 11px;margin-right: 10px;background:rgba(255, 255, 255, 0.1);display: flex;flex-flow: row nowrap;justify-content: center;
+       align-items: center;cursor: pointer;"  @click="gzt">
+      <el-image src="https://028wlkj.cn:30021/public/static/logos/home-stable.png"  style="padding:10px 0;"></el-image>
+            <!-- <img src="../../src/assets/images/home.png" alt="" style="height: 20px;object-fit: contain;width:17px;margin-right:6px;"/>
+             <div style="color: #fff;line-height: 20px;font-size:14px">工作台</div> -->
          </div>
         <!-- <div style="margin: 12px; 15px 0 10px">
           <el-badge :value="2" class="item">
@@ -214,7 +215,7 @@ export default {
   },
   methods: {
     gzt(){
-      window.location.href = 'https://jy.scjysm.asia:18086/home'
+      window.location.href = 'https://admin-uat.028wlkj.com:1020/application-manage'
     },
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
diff --git a/merchant-web-master/src/main.js b/merchant-web-master/src/main.js
index b6e7070..3fec519 100644
--- a/merchant-web-master/src/main.js
+++ b/merchant-web-master/src/main.js
@@ -18,6 +18,12 @@ Vue.prototype.$encrypt = encrypt;
 Vue.prototype.$decrypt = decrypt;
 Vue.prototype.$decryptall = decryptall;
 Vue.prototype.$encryptall = encryptall;
+let host = window.location.host;
+if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' || host === 'localhost:9529') {
+  Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
+} else {
+  Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
+}
 // if (process.env.NODE_ENV === 'production') {
 //   const { mockXHR } = require('../mock')
 //   mockXHR()
diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js
index 7d3b010..42d2290 100644
--- a/merchant-web-master/src/utils/request.js
+++ b/merchant-web-master/src/utils/request.js
@@ -16,16 +16,17 @@ import {
 const host = window.location.host;
 let PREFIX;
 if (host == '172.16.61.48' || host == '172.16.61.49:5173') {
-   PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
+   PREFIX = 'https://jy.scjysm.asia:18086/business-server';
 }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
   // 其他情况的默认值
   // PREFIX = 'http://8.130.38.56:8027/business-server';
-   PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
-  // PREFIX = 'http://192.168.2.225:9004';
+  //  PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
+  // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
+  PREFIX = 'http://10.0.0.51:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
-  PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
+  PREFIX = 'https://jy.scjysm.asia:18086/business-server';
 }
 const baseURL = PREFIX
 // const baseURL = 'http://10.0.0.14:9004'
@@ -35,9 +36,8 @@ const service = axios.create({
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 300000 // request timeout
 })
-
-// export const uploadUrl = 'http://192.168.1.102:8005/file/upload'
-export const uploadUrl = `${baseURL}/file/upload`
+export const uploadUrl = `${baseURL}/miniio/upload`
+// export const uploadUrl = `${baseURL}/file/upload`
 export const WXuploadUrl = `${baseURL}/file/uploadWxMedia` // 直播上传专用
 //export const QYuploadUrl = `${baseURL}/file/uploadQyMedia` // 微信客服上传专用
 export const QYuploadUrl = `${baseURL}/file/upload`
@@ -66,7 +66,7 @@ service.interceptors.response.use(
     if (response.config.responseType === 'blob') {
       return response.data
     }
-    if (res.code !== '') {
+    if (res.code !== '' && res.code !== '200') {
       Message({
         message: res.message || 'Error',
         type: 'error',
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
index 33d43dd..c90cd63 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
@@ -541,7 +541,6 @@ export default {
       if (this.productId) {
         this.form.productId = this.productId
         const sku = JSON.parse(sessionStorage.getItem('form'))
-        console.log(sku)
         sku.forEach((element, i) => {
           for (let index = 0; index < this.form.skus.length; index++) {
             if (i === index) {
@@ -550,6 +549,7 @@ export default {
           }
         })
         console.log(this.form, 'this.form')
+        
         const res = await getClassifyUpdate(this.form)
         if (res.code === '') {
           this.$message({
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
index ed09e39..5763b6c 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
@@ -2,7 +2,9 @@
   <div class="style-information-component">
     <el-form-item label="商品图片" />
     <div class="upload-wrap">
-      <el-upload
+      <upimg filePath="bueniss" :value="imgsGeshi(form.imgs)" inputtype="coverImage" :limit="5"
+                    @changimg="e=>changimg(e,'imgs')"></upimg>
+      <!-- <el-upload
         list-type="picture-card"
         :on-preview="handlePictureCardPreview"
         :on-remove="handleRemove"
@@ -25,7 +27,7 @@
             </span>
           </span>
         </div>
-      </el-upload>
+      </el-upload> -->
     </div>
     <el-form-item label="款式设置">
       <el-radio-group v-model="form.attrStyle" @change="changeAttrStyle">
@@ -204,7 +206,11 @@
 <script>
 import { uploadUrl } from '@/utils/request'
 import { getToken } from '@/utils/auth'
+import upimg from "@/components/ImageUpload/index"
 export default {
+  components: {
+      upimg
+    },
   filters: {
     attrValueFilter(map, list) {
       const hasChilds =
@@ -316,6 +322,23 @@ export default {
     this.headers.tenant = 'MDAwMA=='
   },
   methods: {
+    imgsGeshi(val){
+      let arr = []
+      val.forEach(item => {
+        arr.push(item.imgPath)
+      });
+      arr = arr.join(',')
+      return arr
+    },
+    changimg(e, type) {
+      e = e.split(',')
+      this.form.imgs = []
+       e.map(item => {
+        this.form.imgs.push({
+          imgPath: item
+        })
+        })
+      },
     // proving1(e) {
     //   var keynum = window.event ? e.keyCode : e.which // 获取键盘码
     //   // var keychar = String.fromCharCode(keynum) // 获取键盘码对应的字符
diff --git a/merchant-web-master/src/views/commodity/commoditySystem/index.vue b/merchant-web-master/src/views/commodity/commoditySystem/index.vue
index c59ca86..0451711 100644
--- a/merchant-web-master/src/views/commodity/commoditySystem/index.vue
+++ b/merchant-web-master/src/views/commodity/commoditySystem/index.vue
@@ -61,7 +61,7 @@
           <el-table-column prop="productId" label="商品id" show-overflow-tooltip />
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
-              <img height="80" width="80" :src="scope.row.productImage " alt srcset>
+              <img height="80" width="80" :src="$baseURL+msgList(scope.row.productImage)" alt srcset>
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" width="220" />
@@ -294,6 +294,12 @@ export default {
   },
   // 方法集合
   methods: {
+    msgList(list){
+      if(list && list!=''){
+        let strin = list.split(',')
+        return strin[0]
+      }
+    },
     async getBrandList() {
       const { data } = await getBrandList()
       this.brandList = data
diff --git a/merchant-web-master/src/views/order/aftersale/afterDetails.vue b/merchant-web-master/src/views/order/aftersale/afterDetails.vue
index 28b0c1a..626e8bb 100644
--- a/merchant-web-master/src/views/order/aftersale/afterDetails.vue
+++ b/merchant-web-master/src/views/order/aftersale/afterDetails.vue
@@ -81,7 +81,7 @@
               <div class="good_details">
                 <ul>
                   <li>
-                    <img :src="item.image">
+                    <img :src="$baseURL+item.image">
                     <div class="details">
                       <p>{{ item.productName }}</p>
                       <div class="skuDetails">
diff --git a/merchant-web-master/src/views/order/pending/pendDetails.vue b/merchant-web-master/src/views/order/pending/pendDetails.vue
index 8f6e747..90700ae 100644
--- a/merchant-web-master/src/views/order/pending/pendDetails.vue
+++ b/merchant-web-master/src/views/order/pending/pendDetails.vue
@@ -78,7 +78,7 @@
               <div class="good_details">
                 <ul>
                   <li>
-                    <img :src="item.image">
+                    <img :src="$baseURL+item.image">
                     <div class="details">
                       <p>{{ item.productName }}</p>
                       <p class="skuDetails">
diff --git a/merchant-web-master/src/views/stockControl/inventory/addComponent.vue b/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
index 750605e..7bacabf 100644
--- a/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/addComponent.vue
@@ -2,7 +2,9 @@
   <div class="style-information-component">
     <el-form-item label="商品图片" />
     <div class="upload-wrap">
-      <el-upload
+      <upimg filePath="bueniss" :value="imgsGeshi(form.imgs)" inputtype="coverImage" :limit="5"
+      @changimg="e=>changimg(e,'imgs')"></upimg>
+      <!-- <el-upload
         list-type="picture-card"
         :on-preview="handlePictureCardPreview"
         :on-remove="handleRemove"
@@ -25,7 +27,7 @@
             </span>
           </span>
         </div>
-      </el-upload>
+      </el-upload> -->
     </div>
     <el-form-item label="款式设置">
       <el-radio-group v-model="form.attrStyle" @change="changeAttrStyle">
@@ -37,8 +39,7 @@
       <div v-if="form.attrStyle === 0" class="single-style">
         <el-table
           :data="skuList"
-          style="width: 100%"
-          :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         >
           <el-table-column label="规格">
             <template slot-scope="scope">
@@ -208,7 +209,11 @@
 <script>
 import { uploadUrl } from '@/utils/request'
 import { getToken } from '@/utils/auth'
+import upimg from "@/components/ImageUpload/index"
 export default {
+  components: {
+      upimg
+    },
   filters: {
     attrValueFilter(map, list) {
       const hasChilds =
@@ -320,6 +325,23 @@ export default {
     this.headers.tenant = 'MDAwMA=='
   },
   methods: {
+    imgsGeshi(val){
+      let arr = []
+      val.forEach(item => {
+        arr.push(item.imgPath)
+      });
+      arr = arr.join(',')
+      return arr
+    },
+    changimg(e, type) {
+      e = e.split(',')
+      this.form.imgs = []
+       e.map(item => {
+        this.form.imgs.push({
+          imgPath: item
+        })
+        })
+      },
     // proving1(e) {
     //   var keynum = window.event ? e.keyCode : e.which // 获取键盘码
     //   // var keychar = String.fromCharCode(keynum) // 获取键盘码对应的字符
diff --git a/merchant-web-master/src/views/stockControl/inventory/index.vue b/merchant-web-master/src/views/stockControl/inventory/index.vue
index b2da176..2b015eb 100644
--- a/merchant-web-master/src/views/stockControl/inventory/index.vue
+++ b/merchant-web-master/src/views/stockControl/inventory/index.vue
@@ -60,7 +60,7 @@
           <el-table-column prop="productId" label="商品id" show-overflow-tooltip />
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
-              <img height="80" width="80" :src="scope.row.productImage " alt srcset>
+              <img height="80" width="80" :src="$baseURL+msgList(scope.row.productImage)" alt srcset>
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" width="220" />
@@ -162,7 +162,7 @@
     >
       <el-form ref="form" label-width="80px">
         <el-form-item label="优惠方式">
-          <el-radio-group v-model="mode" @change="modeChange">
+          <el-radio-group v-model="mode">
             <el-radio :label="1">折扣</el-radio>
             <el-radio :label="2">指定价格</el-radio>
           </el-radio-group>
@@ -302,6 +302,12 @@ export default {
   },
   // 方法集合
   methods: {
+    msgList(list){
+      if(list && list!=''){
+        let strin = list.split(',')
+        return strin[0]
+      }
+    },
     async getBrandList() {
       const { data } = await getBrandList()
       this.brandList = data
diff --git a/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue b/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
index 75f0eeb..9d23ca2 100644
--- a/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
+++ b/merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
@@ -43,10 +43,9 @@
       <div class="tableBox">
         <el-table
           ref="multipleTable"
-          v-loading="loading"
           :data="tableData"
           tooltip-effect="dark"
-           @selection-change="handleSelectionChange"
+       
         :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         >
 
@@ -58,7 +57,7 @@
           />
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
-              <img height="80" width="80" :src="scope.row.productImage" alt srcset>
+              <img height="80" width="80" :src="$baseURL+msgList(scope.row.productImage)" alt srcset>
             </template>
           </el-table-column>
           <el-table-column prop="productName" label="商品名称" min-width="10%" />
@@ -176,7 +175,8 @@ export default {
       total: 1,
       tableData: [],
       tableLoading: false,
-      dialogVisible:false
+      dialogVisible:false,
+      currentPage:0
     }
   },
   // 生命周期 - 挂载完成（可以访问DOM元素）
@@ -185,6 +185,12 @@ export default {
   },
   // 方法集合
   methods: {
+    msgList(list){
+      if(list && list!=''){
+        let strin = list.split(',')
+        return strin[0]
+      }
+    },
     toggleFilter(){
       this.fut = !this.fut
     },
@@ -235,7 +241,6 @@ export default {
       this.tableLoading = true
      const res = await getClassifyGetAll(formInline);
       const yujing = await inventoryAlert(res.data.list);
-     this.loading = false;
      this.total = res.data.total;
      this.tableData = yujing.data;
     },