修改

common/utils/utils.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 19:15:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-28 16:53:27
+ * @LastEditTime: 2022-05-07 17:18:50
  * @Description: 一些无法归类的公共方法容器
  */
 
@@ -152,7 +152,9 @@ const toSearchJson = (search)=>{
     });
     return obj;
 }
-export default toSearchJson;
+const getPlatform = ()=>{
+    
+}
 // 工具类的文件需要把文件提供的工具类统一放最下方做一个统一输出
 export {
     // async await 标识结果处理

common/utils/wxpay.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-29 14:26:10
  * @LastEditors: ch
- * @LastEditTime: 2022-05-06 21:23:48
+ * @LastEditTime: 2022-05-07 17:07:08
  * @Description: file content
  */
 

manifest.json

@@ -54,6 +54,38 @@
                         "UniversalLinks" : ""
                     }
                 }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         }
     },

pages/account/address/list.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 13:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-30 14:59:23
+ * @LastEditTime: 2022-05-07 16:24:34
  * @Description: file content
 -->
 <template>
@@ -13,7 +13,7 @@
 				:class="{'address-item__default':item.isDefault}">
 				<radio class="address-item--radio" v-if="query.source == 'submitOrder'" color="#FF875B" 
 					:checked="item.id == selectedId" @click="changeAds(item)"/>
-				<view class="address-item--con">
+				<view class="address-item--con" @click="changeAds(item)">
 					<view class="address-item--city">{{item.province}}{{item.city}}{{item.area}}</view>
 					<view class="address-item--detail">{{item.detailAddress}}</view>
 					<view class="address-item--info">
@@ -89,8 +89,11 @@ export default {
 		 * 选择地址
 		 */
 		changeAds(item){
-			this.selectedId = item.id;
-			this.$Router.back();
+			if(this.query.source == 'submitOrder'){
+				this.selectedId = item.id;
+				this.$Router.back();
+
+			}
 		}
 	},
 };

pages/goods/detail/components/SeckillPrice.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-12 17:33:42
  * @LastEditors: ch
- * @LastEditTime: 2022-04-25 11:56:49
+ * @LastEditTime: 2022-05-07 16:37:00
  * @Description: file content
 -->
 <template>

pages/goods/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 17:27:21
  * @LastEditors: ch
- * @LastEditTime: 2022-05-05 17:19:09
+ * @LastEditTime: 2022-05-07 16:49:33
  * @Description: file content
 -->
 <template>
@@ -47,6 +47,7 @@
 </template>
 <script>
 
+import {formatDate} from '@/common/utils';
 import {ApiGetGoodsDetail, ApiGetGoodsSkus} from '@/common/api/goods';
 import SlideImage from './components/SlideImage.vue';
 import Service from './components/Service.vue';
@@ -102,13 +103,21 @@ export default {
 			this.goods = {...result,
 					images : result.pictureList || [],
 				};
+			const seckillVO = result.productActivityVO;
+			if(seckillVO.isActivity){
+				seckillVO = {
+					...seckillVO,
+					activityStartTime :formatDate(seckillVO.activityStartTime,'yyyy/MM/dd hh:ii:ss'), 
+					activityEndTime : formatDate(seckillVO.activityEndTime,'yyyy/MM/dd hh:ii:ss'), 
+					currentTime : formatDate(seckillVO.currentTime,'yyyy/MM/dd hh:ii:ss'),
+				}
+			}
 			// 秒杀活动数据，单独拎出来传给秒杀价格组件
 			this.productActivityVO = {
-				...result.productActivityVO,
+				...seckillVO,
 				// 原价，取商品起售价
 				originalPrice:result.startingPrice
 			};
-
 			this.getGoodsSkus();
 			
 		},
@@ -135,7 +144,7 @@ export default {
 			this.showSkuPopup = true
 		},
 		service(){
-			uni.$u.toast('客服休假了，遇到喜欢的宝贝就下单吧~')
+			uni.$u.toast('客服休息中，遇到喜欢的宝贝就下单吧~')
 		}
 	}
 	

pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-14 13:44:30
  * @LastEditors: ch
- * @LastEditTime: 2022-04-24 11:02:34
+ * @LastEditTime: 2022-05-07 16:56:16
  * @Description: file content
 -->
 <template>
@@ -46,7 +46,7 @@
 		<UiWhiteBox class="box">
 			<view class="cell-title">
 				<text>上传凭证</text>
-				<text class="cell-title--min">（0/9）</text>
+				<text class="cell-title--min">（{{fileList.length}}/9）</text>
 			</view>
 			<u-upload
 				:fileList="fileList"

pages/order/submit.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-05-03 13:29:28
+ * @LastEditTime: 2022-05-07 17:32:23
  * @Description: file content
 -->
 <template>
@@ -147,7 +147,13 @@ export default {
 				return false;
 			}
 			const {error, result} = await ApiPostSubmitOrder({
+				// #ifdef APP-PLUS
 				orderSource : 2,
+				// #endif
+
+				// #ifdef H5
+				orderSource : this.$store.state.openId ? 5 : 4,
+				// #endif
 				recipientAddressId : this.address.id,
 				shoppingCartIds : query.ids ? query.ids.split(',') : [],
 				products : this.orderInfo.products.map(i => ({

unpackage/debug/.roid.ins

@@ -0,0 +1 @@
+installed

unpackage/dist/build/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.5888dae3.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.0c419f29.js></script></body></html>