Merge branch 'dev1.0.0' into develop

4 years ago · 07fe4d70b0
parent de64c4d882 2c76bbe08c
commit 07fe4d70b0
16 changed files with 35 additions and 26 deletions
--- a/App.vue
+++ b/App.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2019-04-01 01:47:12
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 23:10:37
+ * @LastEditTime: 2022-04-30 17:47:26
 * @Description: file content
 -->
 <script>
@ -11,7 +11,7 @@
 			// console.log('App Launch')
 		},
 		onShow: function() {
-			// console.log('App Show')
+			console.log('App Show')
 		},
 		onHide: function() {
 			// console.log('App Hide')
--- a/h5/index.html
+++ b/h5/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.b44f75e9.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.e11a0d44.js></script></body></html>
--- a/h5/static/js/index.b44f75e9.js
+++ b/h5/static/js/index.b44f75e9.js
--- a/h5/static/js/index.e11a0d44.js
+++ b/h5/static/js/index.e11a0d44.js
--- a/h5/static/js/pages-account-setting-setUserInfo.47a9eeed.js
+++ b/h5/static/js/pages-account-setting-setUserInfo.47a9eeed.js
--- a/h5/static/js/pages-account-setting-setUserInfo.5707f03e.js
+++ b/h5/static/js/pages-account-setting-setUserInfo.5707f03e.js
--- a/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.20109420.js
+++ b/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.20109420.js
--- a/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.43e25515.js
+++ b/h5/static/js/pages-cart-cart~pages-cart-tabBarCart.43e25515.js
--- a/h5/static/js/pages-goods-list-index.971b3b9c.js
+++ b/h5/static/js/pages-goods-list-index.971b3b9c.js
--- a/h5/static/js/pages-goods-list-index.cc1eaf04.js
+++ b/h5/static/js/pages-goods-list-index.cc1eaf04.js
--- a/h5/static/js/pages-order-submit.0e1799ce.js
+++ b/h5/static/js/pages-order-submit.0e1799ce.js
--- a/h5/static/js/pages-order-submit.4e0839da.js
+++ b/h5/static/js/pages-order-submit.4e0839da.js
--- a/pages/account/setting/setUserInfo.vue
+++ b/pages/account/setting/setUserInfo.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-28 15:38:23
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 23:00:21
+ * @LastEditTime: 2022-04-30 18:08:28
 * @Description: file content
 -->
 <template>
@ -46,6 +46,9 @@ export default {
 			return [this.sexData[0].findIndex(i => i.val === this.userInfo.gender)];
 		}
 	},
+	onShow(){
+		console.log('-----++');
+	},
 	methods:{
 		/**
 		 * 切换性别，发起性别修改请求
@ -83,13 +86,15 @@ export default {
 		 */
 		async updateAvatar(val){
 			const file = val.file;
+			const urlArr = file.url.split('/');
+			const fileName = file.name || urlArr[urlArr.length - 1];
 			const oss = await this.getOssCon();
 			uni.uploadFile({
 				name : 'file',
 				filePath : file.url,
 				url : oss.host,
 				formData : {
-					name : file.name,
+					name : fileName,
 					key : `${oss.dir}${'${filename}'}`,
 					policy : oss.policy,
 					OSSAccessKeyId : oss.accessId,
@ -97,7 +102,8 @@ export default {
 					signature : oss.signature
 				},
 				 success : async (res)=>{
-					const avatar = `${oss.host}/${oss.dir}${file.name}`;
+					 console.log(res)
+					const avatar = `${oss.host}/${oss.dir}${fileName}`;
 					const {error, result} = await ApiPutUser({avatar});
 					if(error){
 						ui.$u.totas(error.message);
--- a/pages/cart/components/PageCtx.vue
+++ b/pages/cart/components/PageCtx.vue
@ -143,14 +143,15 @@ export default {
 			return (this.mode === 'normal' ? this.settlementList : this.delList) || []
 		},
 		totalPrice(){
-			const checkedList = this.list.filter(item => this.checkedIds.includes(item.id));
+			const checkedList = this.list.filter(item => this.checkedIds.includes(item.id)) || [];
 			let tempPrice = 0;
 			checkedList.forEach(item => {
 				// 商品单价, 为了方便计算先转换单位为分 (整数)
-                const unitPrice = item.productSku.sellPrice * 100
-                tempPrice += unitPrice * item.number
+                const unitPrice = item.productSku ? item.productSku.sellPrice * 100 : 0
+                tempPrice += unitPrice * (item.number || 0)
 			});
-            return (tempPrice / 100).toFixed(2)
+			// return (tempPrice / 100).toFixed(2)
+			return 0 

 		}
 	},
--- a/pages/goods/list/components/Sort.vue
+++ b/pages/goods/list/components/Sort.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-23 16:37:30
 * @LastEditors: ch
- * @LastEditTime: 2022-04-25 17:39:41
+ * @LastEditTime: 2022-04-30 18:09:50
 * @Description: file content
 -->
 <template>
@ -11,8 +11,8 @@
 			v-for="item in sortData" :key="item.value" @click="change(item)">
 			<text class="sort--label">{{item.label}}</text>
 			<view v-if="item.sort">
-				<view class="sort--icon sort--icon__up" :class="{'sort--icon__active' : item.sort === 'ASC' && item.value === active.value}"></view>
-				<view class="sort--icon sort--icon__down" :class="{'sort--icon__active' : item.sort === 'DESC' && item.value === active.value}"></view>
+				<view class="sort--icon sort--icon__up" :class="{'sort--icon__active' : item.sort === 'asc' && item.value === active.value}"></view>
+				<view class="sort--icon sort--icon__down" :class="{'sort--icon__active' : item.sort === 'desc' && item.value === active.value}"></view>
 			</view>
 		</view>
 	</view>
@ -29,7 +29,7 @@ export default {
 				{
 					value : 'starting_price',
 					label : '价格',
-					sort : 'ASC'
+					sort : 'asc'
 				},
 				// {
 				// 	value : 'sales',
@ -49,7 +49,7 @@ export default {
 	methods:{
 		change(item){
 			if(item.sort){
-				item.sort === 'ASC' ? item.sort = 'DESC' : item.sort = 'ASC';
+				item.sort === 'asc' ? item.sort = 'desc' : item.sort = 'asc';
 			}
 			console.log(item.value + item.sort , this.active.value + this.active.sort);
 			if(item.value + item.sort === this.active.value + this.active.sort){
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-20 14:14:53
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 23:04:31
+ * @LastEditTime: 2022-04-30 18:46:07
 * @Description: file content
 -->
 <template>
@ -22,9 +22,9 @@
 		</UiWhiteBox>
 		

-		<UiWhiteBox >
-			<ui-goods-info v-for="item in orderInfo.products" 
-				:key="item.productId" :data="item" ></ui-goods-info>
+		<UiWhiteBox>
+			<UiGoodsInfo v-for="item in orderInfo.products" 
+				:key="item.productId" :data="item" />
 		</UiWhiteBox>

 		<UiWhiteBox>
@ -88,13 +88,15 @@ export default {
 		// 从地址列表页改变了收货地址
 		uni.$on('changeAddress',(item)=>{
 			this.address = item;
-			this.getBeforeOrder();
 		});
 	},
 	onShow(){
 		// 默认选择设为默认的地址
-		this.address = this.$store.state.address.find(i => i.isDefault) || {};
+		if(!this.address.id){
+			this.address = this.$store.state.address.find(i => i.isDefault) || {};
+		}
 		this.getBeforeOrder();
+
 	},
 	methods:{
 		/**