优化页面和bug

manifest.json

@@ -125,7 +125,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx7a875fc287f41c3a",
+        "appid" : "wxfe9b989440d87124",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

pages.json

@@ -27,6 +27,11 @@
 				"enablePullDownRefresh": true
 			}
 		}, {
+			"path": "pages/tabBar/homeSearch",
+			"style": {
+				"navigationBarTitleText": "商品检索"
+			}
+		}, {
 			"path": "pages/tabBar/classification",
 			"style": {
 				"navigationBarTitleText": "商品"
@@ -226,6 +231,11 @@
 				"style": {
 					"navigationBarTitleText": "积分商品检索"
 				}
+			},{
+				"path": "homeSearch",
+				"style": {
+					"navigationBarTitleText": "积分商品检索"
+				}
 			}]
 		}
 	],

pages/integralMall/buyGoods/commodityDetails.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view style="width: 100%;height: 750rpx;">
-			<image :src="form.filesList[0].url" mode="aspectFit" style="width: 100%;height: 750rpx;" />
+			<image :src="form.filesList[0].url" mode="aspectFit" style="width: 100%;height: 750rpx;" @click='previewImage()'/>
 		</view>
 		<view style="background-color: #fff;padding: 43rpx 65rpx;margin-bottom: 20rpx;">
 			<view style="display: flex;justify-content: space-between;">
@@ -174,6 +174,12 @@
 			})
 		},
 		methods: {
+			previewImage() {
+				uni.previewImage({
+					current: 0, // 当前显示图片的索引，默认是0
+					urls: [this.form.filesList[0].url] // 需要预览的图片HTTP链接列表
+				});
+			},
 			// admin确认
 			adminConfirm() {
 				uni.clearStorageSync();
@@ -282,20 +288,20 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .u-number-box {
+	::v-deep .u-number-box {
 		border: 2rpx #E1E1E1 solid;
 		border-radius: 8rpx;
 	}
 
-	/deep/ .u-number-box__minus {
+	::v-deep .u-number-box__minus {
 		border-right: 2rpx #E1E1E1 solid;
 	}
 
-	/deep/ .u-number-box__plus {
+	::v-deep .u-number-box__plus {
 		border-left: 2rpx #E1E1E1 solid;
 	}
 
-	/deep/ .u-button {
+	::v-deep .u-button {
 		height: 60rpx;
 	}
 

pages/integralMall/classification.vue

@@ -217,6 +217,7 @@
 		},
 		methods: {
 			searchData(data) {
+				console.log(data)
 				this.name = data
 				this.custom()
 			},
@@ -457,7 +458,7 @@
 		background-color: #fff;
 		justify-content: flex-end;
 
-		/deep/ .u-tag--mini {
+		::v-deep .u-tag--mini {
 			font-size: 28rpx;
 			line-height: 22px;
 			padding: 0rpx 24rpx !important;

pages/integralMall/homeSearch.vue

@@ -0,0 +1,116 @@
+<template>
+	<view>
+		<view style="background-color: #E75F37;padding: 20rpx;">
+			<u-search placeholder="请输入商品名称" bgColor="#fff" searchIconColor='#E75F37'  :actionStyle="{color:'#FFF'}"
+				:searchIconSize='24' v-model="keyword" @search='goBack()' @custom="goBack()" focus></u-search>
+		</view>
+		<view class="recentSearches" v-if="recentSearches.length != 0">
+			<view class="recentSearches-head">
+				<view class="recentSearches-headLeft">
+					<u-icon name="clock" color="#C4C4C4"></u-icon>
+					<view style="font-size: 26rpx;margin-left: 6rpx;">最近搜索</view>
+				</view>
+				<view class="recentSearches-headRight">
+					<u-icon name="trash" size="20px" @click="searchDeleteShow = true" color="#C4C4C4"></u-icon>
+				</view>
+			</view>
+			<view class="recentSearches-text">
+				<u-tag v-for="(item,index) in recentSearches" :key="index" :text="item" bgColor="#EFEFEF"
+					color="#414141" borderColor="#EFEFEF" size="medium" closable :show="item" @close="tagClose(index)"
+					shape="circle" @click.stop="tagSearches(item)"></u-tag>
+			</view>
+			<u-modal :show="searchDeleteShow" content="确认删除搜索记录吗？" showCancelButton @confirm="searchDeletefun"
+				@cancel="searchDeleteShow = false" ref="uModal" :asyncClose="true">
+			</u-modal>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				keyword: '',
+				recentSearches: [], // 搜索数据
+				searchDeleteShow: false, // 搜索全部删除弹窗
+			}
+		},
+		mounted() {},
+		onLoad(data) {
+			if (uni.getStorageSync('recentSearches')) {
+				this.recentSearches = uni.getStorageSync('recentSearches').slice(0,10);;
+			}
+			this.keyword = data.searchData
+		},
+		methods: {
+			goBack() {
+				uni.$emit('inSearch',this.keyword)
+				uni.navigateTo({
+					url: '/pages/integralMall/index'
+				})
+			},
+			// 搜索全部删除
+			searchDeletefun() {
+				this.recentSearches = []
+				uni.setStorageSync('recentSearches', this.recentSearches);
+				this.searchDeleteShow = false
+			},
+			// 点击搜索
+			tagSearches(name) {
+				this.keyword = name;
+				uni.$emit('jfSearchData', name)
+				uni.navigateTo({
+					url: '/pages/integralMall/index'
+				})
+			},
+			// 最近搜索点击关闭按钮
+			tagClose(index) {
+				this.recentSearches.splice(index, 1)
+				uni.setStorageSync('recentSearches', this.recentSearches);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tagClass {
+		display: flex;
+		padding: 41rpx 63rpx;
+		background-color: #fff;
+		justify-content: space-around;
+
+		::v-deep .u-tag--mini {
+			font-size: 28rpx;
+			line-height: 22px;
+			padding: 0rpx 24rpx;
+		}
+	}
+
+	.recentSearches {
+		padding: 38rpx 32rpx;
+		background-color: #fff;
+
+		.recentSearches-head {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			color: #C4C4C4;
+
+			.recentSearches-headLeft {
+				display: flex;
+				align-items: center;
+			}
+
+			.recentSearches-headRight {}
+		}
+
+		.recentSearches-text {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: baseline;
+
+			.recentSearches-textWidth {
+				// width: 140rpx;
+			}
+		}
+	}
+</style>

pages/integralMall/index.vue

@@ -84,7 +84,7 @@
 	.containerMall {
 		height: calc(100vh - 85px);
 	}
-	/deep/ .uni-fab__circle--rightBottom {
+	::v-deep .uni-fab__circle--rightBottom {
 		bottom: 170rpx;
 	}
 </style>

pages/integralMall/searchPage.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view style="background-color: #E75F37;padding: 20rpx;">
-			<u-search placeholder="请输入商品名称" bgColor="#fff" :showAction="false" searchIconColor='#E75F37'
-				:searchIconSize='24' v-model="keyword" @search='goBack()'></u-search>
+			<u-search placeholder="请输入商品名称" bgColor="#fff" searchIconColor='#E75F37'  :actionStyle="{color:'#FFF'}"
+				:searchIconSize='24' v-model="keyword" @search='goBack()' @custom="goBack()" focus></u-search>
 		</view>
 		<view class="recentSearches" v-if="recentSearches.length != 0">
 			<view class="recentSearches-head">
@@ -43,7 +43,7 @@
 		},
 		methods: {
 			goBack() {
-				uni.$emit('jfSearchData', name)
+				uni.$emit('jfSearchData',this.keyword)
 				uni.navigateBack({})
 			},
 			// 搜索全部删除
@@ -74,7 +74,7 @@
 		background-color: #fff;
 		justify-content: space-around;
 
-		/deep/ .u-tag--mini {
+		::v-deep .u-tag--mini {
 			font-size: 28rpx;
 			line-height: 22px;
 			padding: 0rpx 24rpx;

pages/integralMall/shoppingCart.vue

@@ -740,20 +740,20 @@
 		padding: 32rpx;
 		margin: 20rpx 0;
 
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			border-color: #E75F37 !important;
 		}
 
-		/deep/ .u-number-box {
+		::v-deep .u-number-box {
 			border: 2rpx #E1E1E1 solid;
 			border-radius: 8rpx;
 		}
 
-		/deep/ .u-number-box__minus {
+		::v-deep .u-number-box__minus {
 			border-right: 2rpx #E1E1E1 solid;
 		}
 
-		/deep/ .u-number-box__plus {
+		::v-deep .u-number-box__plus {
 			border-left: 2rpx #E1E1E1 solid;
 		}
 	}
@@ -765,7 +765,7 @@
 		width: 100%;
 		z-index: 10;
 
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			border-color: #E75F37 !important;
 		}
 

pages/tabBar/activity/details.vue

@@ -445,20 +445,20 @@
 		padding: 32rpx;
 		margin: 20rpx 0;
 
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			border-color: #E75F37 !important;
 		}
 
-		/deep/ .u-number-box {
+		::v-deep .u-number-box {
 			border: 2rpx #E1E1E1 solid;
 			border-radius: 8rpx;
 		}
 
-		/deep/ .u-number-box__minus {
+		::v-deep .u-number-box__minus {
 			border-right: 2rpx #E1E1E1 solid;
 		}
 
-		/deep/ .u-number-box__plus {
+		::v-deep .u-number-box__plus {
 			border-left: 2rpx #E1E1E1 solid;
 		}
 	}
@@ -470,7 +470,7 @@
 		width: 100%;
 		z-index: 10;
 
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			border-color: #E75F37 !important;
 		}
 

pages/tabBar/center.vue

@@ -260,17 +260,17 @@
 		border-radius: 14rpx;
 		bottom: 96rpx;
 
-		/deep/ .u-cell__title-text {
+		::v-deep .u-cell__title-text {
 			font-size: 26rpx;
 			color: #333333;
 		}
 
-		/deep/ .u-cell__value {
+		::v-deep .u-cell__value {
 			font-size: 24rpx;
 			color: #CBCBCB;
 		}
 
-		/deep/ .u-icon__icon--info {
+		::v-deep .u-icon__icon--info {
 			font-size: 28rpx !important;
 			color: #CBCBCB;
 		}
@@ -283,7 +283,7 @@
 		border-radius: 14rpx;
 		bottom: 96rpx;
 
-		/deep/ .u-cell__title-text {
+		::v-deep .u-cell__title-text {
 			font-size: 24rpx;
 			font-weight: 400;
 			color: #797979;

pages/tabBar/classification.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view style="background-color: #E75F37;padding: 20rpx;">
-			<u-search placeholder="请输入商品名称" bgColor="#fff" :showAction="false" searchIconColor='#E75F37'
-				:searchIconSize='24' v-model="name" @click="inSearch" disabled></u-search>
+			<u-search placeholder="请输入商品名称" bgColor="#fff" searchIconColor='#E75F37' :actionStyle="{color:'#FFF'}"
+				:searchIconSize='24' v-model="name" @click="inSearch" disabled @custom="inSearch()"></u-search>
 		</view>
 		<scroll-view @scrolltolower="lowerBottom" scroll-y="true" style="max-height: 92vh;" @scroll="scroll"
 			:scroll-top="scrollTop">
@@ -25,7 +25,7 @@
 			</view>
 			<view v-for="(item, index) in dataList" :key="index">
 				<view class="card" @click="selectProduct(item)">
-					<image :src="item.filesList[0].url" class="cardImg" mode="scaleToFill">
+					<image :src="item.url" class="cardImg" mode="scaleToFill">
 					</image>
 					<view class="">
 						<view style="display: flex;align-items: center;">
@@ -168,7 +168,6 @@
 		},
 		mounted() {},
 		onLoad(data) {
-			console.log(data)
 			// 获取审核状态
 			details().then(res => {
 				this.checkStatus = res.data.checkStatus
@@ -209,11 +208,22 @@
 					current: 1
 				}
 				this.dataList = []
-				let searchCache = JSON.parse(JSON.stringify(uni.getStorageSync('homeSearch')))
-				uni.removeStorageSync('homeSearch')
-				if (searchCache.cname) {
-					this.name = searchCache.cname
+				// let searchCache = 
+				// uni.removeStorageSync('homeSearch')
+				if (uni.getStorageSync('homeSearch')) {
+					this.name = JSON.parse(JSON.stringify(uni.getStorageSync('homeSearch')))
 					this.custom()
+
+				} else if (uni.getStorageSync('cname')) {
+					this.$set(this.search, 'cname', JSON.parse(JSON.stringify(uni.getStorageSync('cname'))))
+					uni.removeStorage('cname')
+					this.page = {
+						total: 0,
+						size: 10,
+						current: 1
+					}
+					this.dataList = []
+					this.onSearch()
 				} else {
 					this.name = null
 					if (this.current == -1) {
@@ -222,6 +232,7 @@
 					this.search = {
 						whether: '0',
 					}
+					console.log(1111)
 					this.onSearch()
 				}
 			})
@@ -229,22 +240,17 @@
 				this.radios.map((item, index) => {
 					item.checked = false
 				});
-				this.checkboxValue=[]
+				this.checkboxValue = []
+				this.dataList = []
 				this.search.originalFactory = null
 				this.search.selfRecovery = null
 				this.search.explosionProof = null
 				this.name = data
-				this.custom()
-			})
-			uni.$on('opensearch', (data) => {
-				if (data) {
-					this.name = ''
-					setTimeout(() => {
-						this.inSearch()
-					}, 500)
-				}
-			})
+				setTimeout(() => {
+					this.custom()
+				}, 400);
 
+			})
 		},
 		onUnload() {
 			// uni.$off('searchData', (data) => {
@@ -257,6 +263,7 @@
 			if (uni.getStorageSync('recentSearches')) {
 				this.recentSearches = uni.getStorageSync('recentSearches');
 			}
+
 		},
 		methods: {
 			openBrand() {
@@ -453,6 +460,7 @@
 			},
 			// 搜索
 			custom() {
+				uni.removeStorageSync('homeSearch')
 				this.current = -1
 				this.page = {
 					total: 0,
@@ -569,7 +577,7 @@
 		background-color: #fff;
 		justify-content: space-around;
 
-		/deep/ .u-tag--mini {
+		::v-deep .u-tag--mini {
 			font-size: 28rpx;
 			line-height: 22px;
 			padding: 0rpx 24rpx;

pages/tabBar/home.vue

@@ -69,7 +69,7 @@
 									mode="aspectFit" class='imgIcon' />
 								<image v-if="item.inventoryLocal ==  0&&item.inventoryShare > 0"
 									src="/static/images/tabBar/crd2x.png" mode="aspectFit" class='imgIcon' />
-								<image :src="item.filesList[0].url" mode="aspectFit"
+								<image :src="item.url" mode="aspectFit"
 									style="width:300rpx;height:300rpx;border-radius:20rpx;border: 2rpx #E7E7E7 solid;" />
 								<text class="text">{{item.cname}}</text>
 								<text
@@ -309,17 +309,6 @@
 			uni.hideLoading();
 		},
 		onShow() {
-			if (uni.getStorageSync('cname')) {
-				this.$set(this.search, 'cname', JSON.parse(JSON.stringify(uni.getStorageSync('cname'))))
-				uni.removeStorageSync('cname')
-				this.page = {
-					total: 0,
-					size: 10,
-					current: 1
-				}
-				this.dataList = []
-				this.onSearch()
-			}
 			activityList({
 				current: 1,
 				size: 10,
@@ -392,9 +381,9 @@
 				this.onSearch()
 			},
 			insearchPage() {
-				uni.$emit('opensearch', true)
-				uni.switchTab({
-					url: `/pages/tabBar/classification`,
+				uni.$emit('homeSearch', true)
+				uni.navigateTo({
+					url: '/pages/tabBar/homeSearch'
 				})
 			},
 			// 车型
@@ -585,24 +574,6 @@
 
 				this.onSearch()
 			},
-			searchButton(value) {
-				this.dataList = []
-				this.page = {
-					total: 0,
-					size: 10,
-					current: 1
-				}
-				this.search = {
-					...this.search,
-					cname: value,
-				}
-				// this.onSearch()
-				uni.setStorageSync('homeSearch', this.search);
-				this.search.cname = null
-				uni.switchTab({
-					url: '/pages/tabBar/classification',
-				})
-			},
 			//打开明细
 			choice(item, index) {
 				if (this.checkStatus != '通过') {

pages/tabBar/homeSearch.vue

@@ -0,0 +1,118 @@
+<template>
+	<view>
+		<view style="background-color: #E75F37;padding: 20rpx;">
+			<u-search placeholder="请输入商品名称" bgColor="#fff" searchIconColor='#E75F37' :actionStyle="{color:'#FFF'}"
+				:searchIconSize='24' v-model="keyword" @search="goBack()" @custom="goBack()" focus></u-search>
+		</view>
+		<view class="recentSearches" v-if="recentSearches.length != 0">
+			<view class="recentSearches-head">
+				<view class="recentSearches-headLeft">
+					<u-icon name="clock" color="#C4C4C4"></u-icon>
+					<view style="font-size: 26rpx;margin-left: 6rpx;">最近搜索</view>
+				</view>
+				<view class="recentSearches-headRight">
+					<u-icon name="trash" size="20px" @click="searchDeleteShow = true" color="#C4C4C4"></u-icon>
+				</view>
+			</view>
+			<view class="recentSearches-text">
+				<u-tag v-for="(item,index) in recentSearches" :key="index" :text="item" bgColor="#EFEFEF"
+					color="#414141" borderColor="#EFEFEF" size="medium" closable :show="item" @close="tagClose(index)"
+					shape="circle" @click.stop="tagSearches(item)"></u-tag>
+			</view>
+			<u-modal :show="searchDeleteShow" content="确认删除搜索记录吗？" showCancelButton @confirm="searchDeletefun"
+				@cancel="searchDeleteShow = false" ref="uModal" :asyncClose="true">
+			</u-modal>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				keyword: '',
+				recentSearches: [], // 搜索数据
+				searchDeleteShow: false, // 搜索全部删除弹窗
+				homePage: false,
+			}
+		},
+		onLoad(data) {
+			if (uni.getStorageSync('recentSearches')) {
+				this.recentSearches = uni.getStorageSync('recentSearches').slice(0, 10);
+			}
+			this.keyword = data.searchData
+		},
+		methods: {
+			goBack() {
+				uni.$emit('searchData', this.keyword)
+				uni.setStorageSync('homeSearch', this.keyword);
+				uni.switchTab({
+					url: '/pages/tabBar/classification'
+				});
+			},
+			// 搜索全部删除
+			searchDeletefun() {
+				this.recentSearches = []
+				uni.setStorageSync('recentSearches', this.recentSearches);
+				this.searchDeleteShow = false
+			},
+			// 点击搜索
+			tagSearches(name) {
+				this.keyword = name;
+				uni.$emit('searchData', name)
+				uni.setStorageSync('homeSearch', name);
+				uni.switchTab({
+					url: '/pages/tabBar/classification'
+				});
+			},
+			// 最近搜索点击关闭按钮
+			tagClose(index) {
+				this.recentSearches.splice(index, 1)
+				uni.setStorageSync('recentSearches', this.recentSearches);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tagClass {
+		display: flex;
+		padding: 41rpx 63rpx;
+		background-color: #fff;
+		justify-content: space-around;
+
+		::v-deep .u-tag--mini {
+			font-size: 28rpx;
+			line-height: 22px;
+			padding: 0rpx 24rpx;
+		}
+	}
+
+	.recentSearches {
+		padding: 38rpx 32rpx;
+		background-color: #fff;
+
+		.recentSearches-head {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			color: #C4C4C4;
+
+			.recentSearches-headLeft {
+				display: flex;
+				align-items: center;
+			}
+
+			.recentSearches-headRight {}
+		}
+
+		.recentSearches-text {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: baseline;
+
+			.recentSearches-textWidth {
+				// width: 140rpx;
+			}
+		}
+	}
+</style>

pages/tabBar/searchPage.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view style="background-color: #E75F37;padding: 20rpx;">
-			<u-search placeholder="请输入商品名称" bgColor="#fff" :showAction="false" searchIconColor='#E75F37'
-				:searchIconSize='24' v-model="keyword" @search='goBack()' focus></u-search>
+			<u-search placeholder="请输入商品名称" bgColor="#fff" searchIconColor='#E75F37' :actionStyle="{color:'#FFF'}"
+				:searchIconSize='24' v-model="keyword" @search="goBack()" @custom="goBack()" focus></u-search>
 		</view>
 		<view class="recentSearches" v-if="recentSearches.length != 0">
 			<view class="recentSearches-head">
@@ -15,9 +15,9 @@
 				</view>
 			</view>
 			<view class="recentSearches-text">
-				<u-tag v-for="(item,index) in recentSearches" :key="index" :text="item" bgColor="#EFEFEF" color="#414141"
-					borderColor="#EFEFEF" size="medium" closable :show="item" @close="tagClose(index)" shape="circle"
-					@click.stop="tagSearches(item)"></u-tag>
+				<u-tag v-for="(item,index) in recentSearches" :key="index" :text="item" bgColor="#EFEFEF"
+					color="#414141" borderColor="#EFEFEF" size="medium" closable :show="item" @close="tagClose(index)"
+					shape="circle" @click.stop="tagSearches(item)"></u-tag>
 			</view>
 			<u-modal :show="searchDeleteShow" content="确认删除搜索记录吗？" showCancelButton @confirm="searchDeletefun"
 				@cancel="searchDeleteShow = false" ref="uModal" :asyncClose="true">
@@ -32,20 +32,19 @@
 				keyword: '',
 				recentSearches: [], // 搜索数据
 				searchDeleteShow: false, // 搜索全部删除弹窗
+				homePage: false,
 			}
 		},
-		mounted() {},
 		onLoad(data) {
 			if (uni.getStorageSync('recentSearches')) {
-				this.recentSearches = uni.getStorageSync('recentSearches').slice(0,10);
+				this.recentSearches = uni.getStorageSync('recentSearches').slice(0, 10);
 			}
 			this.keyword = data.searchData
 		},
-		
 		methods: {
 			goBack() {
-				uni.$emit('searchData', this.keyword)
-				uni.navigateBack({})
+			uni.$emit('searchData', this.keyword)
+			uni.navigateBack({})
 			},
 			// 搜索全部删除
 			searchDeletefun() {
@@ -55,7 +54,7 @@
 			},
 			// 点击搜索
 			tagSearches(name) {
-				this.keyword=name;
+				this.keyword = name;
 				uni.$emit('searchData', name)
 				uni.navigateBack({})
 			},
@@ -75,7 +74,7 @@
 		background-color: #fff;
 		justify-content: space-around;
 
-		/deep/ .u-tag--mini {
+		::v-deep .u-tag--mini {
 			font-size: 28rpx;
 			line-height: 22px;
 			padding: 0rpx 24rpx;
@@ -85,6 +84,7 @@
 	.recentSearches {
 		padding: 38rpx 32rpx;
 		background-color: #fff;
+
 		.recentSearches-head {
 			display: flex;
 			align-items: center;

pages/tabBar/shoppingCart.vue

@@ -892,20 +892,20 @@
 		padding: 32rpx;
 		margin: 20rpx 0;
 
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			border-color: #E75F37 !important;
 		}
 
-		/deep/ .u-number-box {
+		::v-deep .u-number-box {
 			border: 2rpx #E1E1E1 solid;
 			border-radius: 8rpx;
 		}
 
-		/deep/ .u-number-box__minus {
+		::v-deep .u-number-box__minus {
 			border-right: 2rpx #E1E1E1 solid;
 		}
 
-		/deep/ .u-number-box__plus {
+		::v-deep .u-number-box__plus {
 			border-left: 2rpx #E1E1E1 solid;
 		}
 	}
@@ -917,7 +917,7 @@
 		width: 100%;
 		z-index: 10;
 
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			border-color: #E75F37 !important;
 		}
 

pages/views/buyGoods/commodityDetails.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<view style="width: 100%;height: 750rpx;">
-			<image :src="form.filesList[0].url" mode="aspectFit" style="width: 100%;height: 750rpx;" />
+			<image :src="form.filesList[0].url" mode="aspectFit" style="width: 100%;height: 750rpx;"
+				@click="previewImage()" />
 		</view>
 		<view style="background-color: #fff;padding: 43rpx 65rpx;margin-bottom: 20rpx;">
 			<view style="display: flex;justify-content: space-between;">
@@ -198,6 +199,12 @@
 
 		},
 		methods: {
+			previewImage() {
+				uni.previewImage({
+					current: 0, // 当前显示图片的索引，默认是0
+					urls: [this.form.filesList[0].url] // 需要预览的图片HTTP链接列表
+				});
+			},
 			// admin确认
 			adminConfirm() {
 				uni.clearStorageSync();
@@ -224,6 +231,7 @@
 			stockDescListfun() {
 				listShareV1({
 					code: uni.getStorageSync('whether_openShare') == 1 ? this.form.goodsCode : this.form.code,
+					id:this.form.id,
 					whether: 0
 				}).then(res => {
 					this.inventoryDataForm = res.data
@@ -336,20 +344,20 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .u-number-box {
+	::v-deep .u-number-box {
 		border: 2rpx #E1E1E1 solid;
 		border-radius: 8rpx;
 	}
 
-	/deep/ .u-number-box__minus {
+	::v-deep .u-number-box__minus {
 		border-right: 2rpx #E1E1E1 solid;
 	}
 
-	/deep/ .u-number-box__plus {
+	::v-deep .u-number-box__plus {
 		border-left: 2rpx #E1E1E1 solid;
 	}
 
-	/deep/ .u-button {
+	::v-deep .u-button {
 		height: 60rpx;
 	}
 

pages/views/personalInformation/addressDetails.vue

@@ -207,20 +207,20 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .u-checkbox__icon-wrap {
+	::v-deep .u-checkbox__icon-wrap {
 		border-color: #E75F37 !important;
 	}
 
-	/deep/ .u-checkbox-group--row {
+	::v-deep .u-checkbox-group--row {
 		justify-content: flex-end;
 	}
 
-	/deep/ .textarea-placeholder {
+	::v-deep .textarea-placeholder {
 		font-size: 26rpx;
 		color: #C4C4C4;
 	}
 
-	/deep/ .u-textarea {
+	::v-deep .u-textarea {
 		background-color: #F8F8F8 !important;
 	}
 
@@ -229,7 +229,7 @@
 		bottom: 120rpx;
 		left: 300rpx;
 		z-index: 10;
-		/deep/ .u-button {
+		::v-deep .u-button {
 			height: 60rpx;
 		}
 	}

pages/views/personalInformation/addressManagement.vue

@@ -139,11 +139,11 @@
 		background: #FFFFFF;
 		margin-bottom: 20rpx;
 
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			border-color: #E75F37 !important;
 		}
 
-		/deep/ .u-button {
+		::v-deep .u-button {
 			height: 60rpx;
 		}
 	}

pages/views/personalInformation/contacts.vue

@@ -236,7 +236,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .u-form-item {
+	::v-deep .u-form-item {
 		width: 570rpx;
 	}
 </style>

pages/views/personalInformation/index.vue

@@ -356,7 +356,7 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .u-form-item {
+	::v-deep .u-form-item {
 		width: 570rpx;
 	}
 </style>

pages/views/salesSlip/index.vue

@@ -269,7 +269,7 @@
 		background-color: #fff;
 		margin-bottom: 20rpx;
 
-		/deep/ .u-button {
+		::v-deep .u-button {
 			height: 60rpx;
 		}
 	}

pages/views/salesSlip/obligation.vue

@@ -498,7 +498,7 @@
 		background-color: #fff;
 		margin-bottom: 20rpx;
 
-		/deep/ .u-button {
+		::v-deep .u-button {
 			height: 60rpx;
 		}
 	}

pages/views/vehicle/autoParts.vue

@@ -59,8 +59,8 @@
 			SearchJump(cname) {
 				goodsdescGetCnameInt({cname}).then(res=>{
 					uni.setStorageSync('cname', res.data);
-					uni.switchTab({
-						url: '/pages/tabBar/home',
+					uni.reLaunch({
+						url: '/pages/tabBar/classification',
 					})
 				})
 			},

static/certificate/development/private.wx03ff2a1cf5472e2f.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAxlenz/5zJY1q5W68h33RGVL2GODTbMpznwnpsjmf408jinAO
+W3T5vZSvp+trtNqsNm4EUxDbgkZKDDmF6piYtEKlqDOEYefgea3kQi2HFdhDzhYI
+81owTy6GABSfqc1KtQbVEuvC8tiEeT4oFc8NcT/Og0np1U0QKf9JQSp+qi1Y7fPv
+plyRQ+3b5IhSszJNF2ZXDPcDTP/5RAs3kNwDNErNVNEYdo/DIX7NONDvUwoNobq8
+c/y2N8s5+lc/7tcgCictoWb3wuzNb6onJzJFNTS7krUT9XZg0m9LSzvZV1K8r62n
+IiezilryUF0ahxapamXG5hDMR9qLRn9UnfOHYwIDAQABAoIBAQCK79QpqwBWCd4b
+oZqG/ud+adLiUntH9flQKs19f0g1HrayvxQPlL1sw77YTd1A7v07k42L8n8RntM4
+BQN99i7h9t28GXpeauOf2OPQR7wc3UWCE4Vpkn/Mt7Y+UDQX6iqu7H5NpsEFBA6o
+L5Y80LGF50BuT1Rxim4MPTu/XlkkMyut30thNzmqRnA/DlqUGRkXlvHlN/2TjmQJ
+UV6HCry6TJ9qiqq58zUpCAP2gt34WmilBH3i7UHqj8xgN9NK52WwXn4mtEILDPdx
+JqkXprpRgND1W5wZXlyeIxKgsTwnmFn9q9bm2kCwm+QDsgAkZ0CW0H3sF20HywOs
++Y8VgTFhAoGBAO42zZeQPyEcc0RWAAPYurnvvzChtNdqGF1vwi7EomW3mK8/5tvG
+1yPD77CW/+POrKMyyAUlm28O/2oHbtaMyIC6g+GATnPzx4+NYKy+PAeMYaCTfE2T
+rVhL6R1Dxh6sQ5DKv1xcM6QeXtP+4R5gqKCjGSn12eDIwZZw6xj8JQ41AoGBANUm
+v/R3nroWqPN4JUM3839YAtE7wnT74xU9VhV8vls76cKW2uf3fUt+2sQ4rNF10dKO
+/qfUVEToUuC+qtQ2CI1KIJ4pg4hL4hxTHmTOL2YZF8rofURV57E4E9Zv0/cRGqCs
+qowRlbXqkLEXNg7lR2VKRWHH7F5ld96BrmWdvtI3AoGBAJ33A4ClK+fGGP3Q1bO3
+TaOtQyh5oxVSCpQzXx5qUJKJHBvikTFeex4BeXmtuESVsc+LBi67kIYl+OOTyEFI
+HFGY3Yl07xFfMA+WnewPPnl28uprwvsimcm6lPxODBwc+bUTbbBOiAQmC5YjJ59g
+U5Iqda5olLHGDvG3MX9g/SWdAoGAaiXjAB62CBwSxTS28dOiSm+M75/gBhwOiVxD
+S24U6iBbGFHB8DUay4b/8Sn8Pk97T21wuimOUcaUx2GMdyP1fE9HERzBaRXJI6vs
+/eyEREcIxz6ia26QdHvlvStxlp+I8C0svZZgRPjsV5SkkiRyOqoTBU/nkVbcrA1O
+yUIWbl8CgYBxG1jjGMPtbvaqP3nLuU069Pws8/UI91fMQfcBbox3X4hU7WPOPHb9
+Q0vsenVT6Jc1k1W56HHXBgCk1JqL+gPpCroiZvE31O94UXFhwFhZP6QW8AAz3FZI
+qTaBrA/KfrZcBnxnWAIzu7MWPTJLmwNtywkjJxW7sj5JpKtw+JSwCw==
+-----END RSA PRIVATE KEY-----

uni_modules/map-Point/components/map-Point/map-Point.vue

@@ -727,7 +727,7 @@
 					height: 100%;
 					display: flex;
 
-					/deep/ .u-icon {
+					::v-deep .u-icon {
 						.u-icon__icon {
 							font-size: 45rpx !important;
 							font-weight: bold !important;