From 0bca17ff4cc4880da4d65749db6ab1b414a82c03 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Wed, 13 Nov 2024 08:44:16 +0800
Subject: [PATCH] 11

---
 pages/index/index.vue          | 32 +++++---------------------------
 pages/inventory/goodsList1.vue |  2 +-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0fa93e9..226bdcb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -35,15 +35,7 @@
 						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/01c48cc06cfb4f44aa304fbc26df048c.jpg"
 							alt="" class="title-img" />
 						<text>Ai入库</text>
-						<!-- <text v-if="waitCount.waitPurchaseCount > 0"
-							class="red-circle">{{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}}</text> -->
 					</view>
-					<!-- <view class="title-btn-sbtn" @tap="goSonPage('/pages/index/waitStorage?inStorageStatus=0')">
-						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/01c48cc06cfb4f44aa304fbc26df048c.jpg" alt="" class="title-img" />
-						<text>待入库</text>
-						<text v-if="waitCount.waitPurchaseCount > 0"
-							class="red-circle">{{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}}</text>
-					</view> -->
 				</view>
 			</view>
 			<view class="waimai" :style="{'right':waimaiRight}" @tap="quwaimai"></view>
@@ -137,11 +129,7 @@
 		<view>
 			<scroll-view scroll-y="true" style="height: 100%;">
 				<u-popup :show="settingShow" @close="settingShow = false" closeOnClickOverlay mode="left" safeAreaInsetTop>
-					<view class="popup-content" style="height: 1375rpx;">
-						<!-- <view class="content-avatar">
-							<u-avatar :src="avatar"></u-avatar>
-							<view class="shop-name">{{ shopName }}</view>
-						</view> -->
+					<view class="popup-content" style="height: 1375rpx;padding-top: 86rpx;">
 						<view style="z-index:999">
 							<u-cell-group>
 								<u-cell icon="grid-fill" url="/pages/index/checkShop" title="切换当前店铺" clickable isLink
@@ -149,8 +137,6 @@
 								<view class="border-line"></view>
 								<u-cell icon="man-add-fill" url="/package1/index/peopleList?popleType=gysName&noClick=1"
 									title="供货商管理" clickable isLink arrow-direction="left"></u-cell>
-								<!-- <u-cell icon="man-add-fill" url="/pages/index/upstream" v-if="type==0" title="供货商欠款"
-									clickable isLink arrow-direction="left"></u-cell> -->
 								<u-cell icon="man-add-fill" url="/package1/index/waitStorage?inStorageStatus=1" title="采购单历史"
 									clickable isLink arrow-direction="left"></u-cell>
 								<u-cell icon="man-add-fill" url="/package1/inventory/inventoryReturnList" title="采购退货"
@@ -163,8 +149,6 @@
 									
 								<u-cell icon="account-fill" url="/package1/index/customClassList"
 									title="客户分类" clickable isLink arrow-direction="left"></u-cell>
-								<!-- <u-cell icon="account-fill" url="/pages/index/downstream" v-if="type==0" title="客户欠款"
-									clickable isLink arrow-direction="left"></u-cell> -->
 								<u-cell icon="account-fill" url="/package1/index/order?type=dingdan" title="销售单历史" clickable
 									isLink arrow-direction="left"></u-cell>
 								<u-cell icon="account-fill" url="/package1/index/returnOrder" title="退货单历史" clickable
@@ -175,9 +159,7 @@
 								<u-cell icon="home-fill" url="/package1/index/shopAssociation"
 									title="店铺关联组" clickable isLink arrow-direction="left"></u-cell> -->
 								<view class="border-line"></view>
-								<u-cell icon="rewind-right-fill" url="/package1/index/updateShopMsg" title="更新店铺信息" clickable
-									isLink arrow-direction="left"></u-cell>
-								<u-cell v-if="shopName == '炘钱' || shopName == '炘玩' || shopName == '测试库新店' || shopName == '提钱退休'"
+								<u-cell v-if="shopName == '炘钱' || shopName == '炘玩' || shopName == '测试库新店' || shopName == '王浩伟测试8.1' || shopName == '提钱退休'"
 									icon="integral-fill" url="/package1/AI/addAiList" title="管理员登录" clickable isLink
 									arrow-direction="left"></u-cell>
 								<!-- <u-cell icon="integral-fill" url="" title="电费缴纳" clickable isLink
@@ -188,14 +170,8 @@
 									isLink arrow-direction="left"></u-cell>
 								<!-- <u-cell icon="heart-fill" url="/package1/index/publicWelfare" title="公益公示" clickable isLink
 									arrow-direction="left"></u-cell> -->
-								<u-cell icon="heart-fill" url="/package1/other/tutorialList" title="使用教程" clickable isLink
-									arrow-direction="left"></u-cell>
-								<u-cell icon="server-man" url="/package1/index/feedBack" title="问题反馈" clickable isLink
-									arrow-direction="left"></u-cell>
-								<u-cell icon="setting-fill" url="/pages/index/shopInfo" title="修改个人信息" clickable isLink
+								<u-cell icon="setting-fill" url="/package1/index/setUp" title="设置" clickable isLink
 									arrow-direction="left"></u-cell>
-								<!-- <u-cell icon="setting-fill" url="/pages/index/shopInfo" title="设置" clickable isLink
-									arrow-direction="left"></u-cell> -->
 								<u-cell icon="rewind-left-fill" @click="outLogin" title="退出登录" clickable isLink
 									arrow-direction="left"></u-cell>
 							</u-cell-group>
@@ -507,6 +483,8 @@
 				await this.tui.modal("提示", type=='goPay'?"您确定要撤销订单并重新开单吗？":"您确定要撤销订单吗？", true, (res) => {
 					if (res) {
 						that.cancelSale(item,type)
+					}else{
+						that.returnList = new Map()
 					}
 				})
 			},
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 982124e..525adbe 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -8685,7 +8685,7 @@
 				uni.setStorageSync('saoma', '1')
 				uni.scanCode({
 					success: (res) => {
-						if (res.scanType == "QR_CODE") { //二维码
+						if (res.scanType == "QR_CODE") { //二维码1
 							if(res.result.split(',').length > 2){
 								that.attrBuilt = decodeURIComponent(res.result.split(',')[2].split('-')[0])+'-'+decodeURIComponent(res.result.split(',')[2].split('-')[1])
 							}