Merge branch 'dev1.0.0' into develop

common/api/order.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-29 17:38:17
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 11:10:55
+ * @LastEditTime: 2022-04-19 15:00:05
  * @Description: file content
  */
 import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@@ -76,7 +76,16 @@ export const ApiPutCancelOrder = (data) =>
 export const ApiPostWxPay = (data) => 
 	// ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/app`, data));
 	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/pay/payTest`, data));
-	
+
+/**
+ * 获取订单统计数据
+ */
+export const ApiGetOrderStatistics = () => 
+	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/statistics`))
+
+
+
+
 
 
 

common/dicts/order.js

@@ -1,30 +0,0 @@
-/*
- * @Author: ch
- * @Date: 2022-03-29 16:47:32
- * @LastEditors: ch
- * @LastEditTime: 2022-04-14 10:14:40
- * @Description: file content
- */
-
-import Enum from "@/common/plugins/enum"
-const DictOrderStatus = new Enum([
-	{key : '1', name : '待支付', value: 'awaitPay'},
-	{key : '2', name : '已关闭', value: 'close'},
-	{key : '3', name : '待发货', value: 'awaitSend'},
-	{key : '4', name : '已发货', value: 'finishSend'},
-	{key : '6', name : '已收货', value: 'finishReceiving'},
-	{key : '7', name : '已完成', value: 'end'}
-])
-const DictSaleAfterStatus = {
-	"1":"已申请",
-	"2":"已关闭",
-	"3":"待退货",
-	"4":"退货中",
-	"5":"退款中",
-	"6":"退款成功",
-	"7":"退款失败"
-}
-export {
-	DictOrderStatus,
-	DictSaleAfterStatus
-}

common/enum/coupon/ApplyRange.js

@@ -1,10 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：优惠券适用范围
- * ApplyRangeEnum
- */
-export default new Enum([
-  { key: 'ALL', name: '全部商品', value: 10 },
-  { key: 'SOME_GOODS', name: '指定商品', value: 20 }
-])

common/enum/coupon/CouponType.js

@@ -1,10 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：优惠券类型
- * CouponTypeEnum
- */
-export default new Enum([
-  { key: 'FULL_DISCOUNT', name: '满减券', value: 10 },
-  { key: 'DISCOUNT', name: '折扣券', value: 20 }
-])

common/enum/coupon/ExpireType.js

@@ -1,10 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：优惠券到期类型
- * ExpireTypeEnum
- */
-export default new Enum([
-  { key: 'RECEIVE', name: '领取后', value: 10 },
-  { key: 'FIXED_TIME', name: '固定时间', value: 20 }
-])

common/enum/coupon/index.js

@@ -1,5 +0,0 @@
-import ApplyRangeEnum from './ApplyRange'
-import ExpireTypeEnum from './ExpireType'
-import CouponTypeEnum from './CouponType'
-
-export { ApplyRangeEnum, CouponTypeEnum, ExpireTypeEnum }

common/enum/enum.js

@@ -1,85 +0,0 @@
-/**
- * 枚举类
- * Enum.IMAGE.name                => "图片"
- * Enum.getNameByKey('IMAGE')     => "图片"
- * Enum.getValueByKey('IMAGE')    => 10
- * Enum.getNameByValue(10)        => "图片"
- * Enum.getData()                 => [{key: "IMAGE", name: "图片", value: 10}]
- */
-class Enum {
-  constructor (param) {
-    const keyArr = []
-    const valueArr = []
-
-    if (!Array.isArray(param)) {
-      throw new Error('param is not an array!')
-    }
-
-    param.map(element => {
-      if (!element.key || !element.name) {
-        return
-      }
-      // 保存key值组成的数组，方便A.getName(name)类型的调用
-      keyArr.push(element.key)
-      valueArr.push(element.value)
-      // 根据key生成不同属性值，以便A.B.name类型的调用
-      this[element.key] = element
-      if (element.key !== element.value) {
-        this[element.value] = element
-      }
-    })
-
-
-    // 保存源数组
-    this.data = param
-    this.keyArr = keyArr
-    this.valueArr = valueArr
-
-    // 防止被修改
-    // Object.freeze(this)
-  }
-
-  // 根据key得到对象
-  keyOf (key) {
-    return this.data[this.keyArr.indexOf(key)]
-  }
-
-  // 根据key得到对象
-  valueOf (key) {
-    return this.data[this.valueArr.indexOf(key)]
-  }
-
-  // 根据key获取name值
-  getNameByKey (key) {
-    const prop = this.keyOf(key)
-    if (!prop) {
-      throw new Error('No enum constant' + key)
-    }
-    return prop.name
-  }
-
-  // 根据value获取name值
-  getNameByValue (value) {
-    const prop = this.valueOf(value)
-    if (!prop) {
-      throw new Error('No enum constant' + value)
-    }
-    return prop.name
-  }
-
-  // 根据key获取value值
-  getValueByKey (key) {
-    const prop = this.keyOf(key)
-    if (!prop) {
-      throw new Error('No enum constant' + key)
-    }
-    return prop.key
-  }
-
-  // 返回源数组
-  getData () {
-    return this.data
-  }
-}
-
-export default Enum

common/enum/order/DeliveryStatus.js

@@ -1,10 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：订单发货状态
- * DeliveryStatusEnum
- */
-export default new Enum([
-  { key: 'NOT_DELIVERED', name: '未发货', value: 10 },
-  { key: 'DELIVERED', name: '已发货', value: 20 }
-])

common/enum/order/DeliveryType.js

@@ -1,9 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：配送方式
- * DeliveryTypeEnum
- */
-export default new Enum([
-  { key: 'EXPRESS', name: '快递配送', value: 10 }
-])

common/enum/order/OrderSource.js

@@ -1,11 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：订单来源
- * OrderSourceEnum
- */
-export default new Enum([
-  { key: 'MASTER', name: '普通订单', value: 10 },
-  { key: 'BARGAIN', name: '砍价订单', value: 20 },
-  { key: 'SHARP', name: '秒杀订单', value: 30 }
-])

common/enum/order/OrderStatus.js

@@ -1,12 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：订单状态
- * OrderStatusEnum
- */
-export default new Enum([
-  { key: 'NORMAL', name: '进行中', value: 10 },
-  { key: 'CANCELLED', name: '已取消', value: 20 },
-  { key: 'APPLY_CANCEL', name: '待取消', value: 21 },
-  { key: 'COMPLETED', name: '已完成', value: 30 }
-])

common/enum/order/PayStatus.js

@@ -1,10 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：订单支付状态
- * PayStatusEnum
- */
-export default new Enum([
-  { key: 'PENDING', name: '待支付', value: 10 },
-  { key: 'SUCCESS', name: '已支付', value: 20 }
-])

common/enum/order/PayType.js

@@ -1,10 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：订单支付方式
- * PayTypeEnum
- */
-export default new Enum([
-  { key: 'BALANCE', name: '余额支付', value: 10 },
-  { key: 'WECHAT', name: '微信支付', value: 20 }
-])

common/enum/order/ReceiptStatus.js

@@ -1,10 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：订单收货状态
- * ReceiptStatusEnum
- */
-export default new Enum([
-  { key: 'NOT_RECEIVED', name: '未收货', value: 10 },
-  { key: 'RECEIVED', name: '已收货', value: 20 }
-])

common/enum/order/index.js

@@ -1,17 +0,0 @@
-import DeliveryStatusEnum from './DeliveryStatus'
-import DeliveryTypeEnum from './DeliveryType'
-import OrderSourceEnum from './OrderSource'
-import OrderStatusEnum from './OrderStatus'
-import PayStatusEnum from './PayStatus'
-import PayTypeEnum from './PayType'
-import ReceiptStatusEnum from './ReceiptStatus'
-
-export {
-    DeliveryStatusEnum,
-    DeliveryTypeEnum,
-    OrderSourceEnum,
-    OrderStatusEnum,
-    PayStatusEnum,
-    PayTypeEnum,
-    ReceiptStatusEnum
-}

common/enum/order/refund/AuditStatus.js

@@ -1,11 +0,0 @@
-import Enum from '../../enum'
-
-/**
- * 枚举类：商家审核状态
- * AuditStatusEnum
- */
-export default new Enum([
-  { key: 'WAIT', name: '待审核', value: 0 },
-  { key: 'REVIEWED', name: '已同意', value: 10 },
-  { key: 'REJECTED', name: '已拒绝', value: 20 }
-])

common/enum/order/refund/RefundStatus.js

@@ -1,12 +0,0 @@
-import Enum from '../../enum'
-
-/**
- * 枚举类：售后单状态
- * RefundStatusEnum
- */
-export default new Enum([
-  { key: 'NORMAL', name: '进行中', value: 0 },
-  { key: 'REJECTED', name: '已拒绝', value: 10 },
-  { key: 'COMPLETED', name: '已完成', value: 20 },
-  { key: 'CANCELLED', name: '已取消', value: 30 }
-])

common/enum/order/refund/RefundType.js

@@ -1,10 +0,0 @@
-import Enum from '../../enum'
-
-/**
- * 枚举类：售后类型
- * RefundTypeEnum
- */
-export default new Enum([
-  { key: 'RETURN', name: '退货退款', value: 10 },
-  { key: 'EXCHANGE', name: '换货', value: 20 }
-])

common/enum/order/refund/index.js

@@ -1,9 +0,0 @@
-import AuditStatusEnum from './AuditStatus'
-import RefundStatusEnum from './RefundStatus'
-import RefundTypeEnum from './RefundType'
-
-export {
-    AuditStatusEnum,
-    RefundStatusEnum,
-    RefundTypeEnum
-}

common/enum/setting/Key.js

@@ -1,27 +0,0 @@
-import Enum from '../enum'
-
-/**
- * 枚举类：设置项索引
- * SettingKeyEnum
- */
-export default new Enum([{
-    key: 'REGISTER',
-    name: '账户注册设置',
-    value: 'register'
-  },
-  {
-    key: 'PAGE_CATEGORY_TEMPLATE',
-    name: '分类页模板',
-    value: 'page_category_template'
-  },
-  {
-    key: 'POINTS',
-    name: '积分设置',
-    value: 'points'
-  },
-  {
-    key: 'RECHARGE',
-    name: '充值设置',
-    value: 'recharge'
-  }
-])

common/enum/store/page/category/Style.js

@@ -1,11 +0,0 @@
-import Enum from '../../../enum'
-
-/**
- * 枚举类：地址类型
- * PageCategoryStyleEnum
- */
-export default new Enum([
-  { key: 'ONE_LEVEL_BIG', name: '一级分类[大图]', value: 10 },
-  { key: 'ONE_LEVEL_SMALL', name: '一级分类[小图]', value: 11 },
-  { key: 'TWO_LEVEL', name: '二级分类', value: 20 }
-])

common/enum/store/page/category/index.js

@@ -1,3 +0,0 @@
-import PageCategoryStyleEnum from './Style'
-
-export { PageCategoryStyleEnum }

common/plugins/msbUniRequest.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 16:36:59
  * @LastEditors: ch
- * @LastEditTime: 2022-04-13 13:36:15
+ * @LastEditTime: 2022-04-20 10:41:17
  * @Description: 针对uniapp request请求做了一次封装，使用思维参考axios
  * 
  * 
@@ -46,6 +46,9 @@
 class MsbUniRequest {
 	constructor (option){
 		this.baseUrl = '';
+		this.header = {
+			repeat : true
+		}
 		this.hook = {
 			request : null,
 			success : null,
@@ -54,6 +57,7 @@ class MsbUniRequest {
 		
 	}
 	method(option){
+		option.header = {...this.header,...option.header};
 		option.url = this.baseUrl + option.url;
 		if(this.hook.request && !option.header){
 			option = this.hook.request(option);
@@ -65,15 +69,36 @@ class MsbUniRequest {
 			return option
 		}
 		return new Promise((resolve, reject)=>{
-			uni.request(option).then(res => {
-				const response = res[1];
-				if(response.statusCode >= 200 && response.statusCode < 400){
-					resolve(this.hook.success ? this.hook.success(response) : response);
-					return false;
+			uni.request({
+				...option,
+				success: res => {
+					const response = res || res[1];
+					// 200 - 399状态为正常
+					if(response.statusCode >= 200 && response.statusCode < 400){
+						if(!this.hook.success){
+							resolve(response);
+						}else{
+							let newRes = this.hook.success(response, option);
+							// 业务结果处理可能为一个Promise对象，根据结果调用错误或正确状态
+							if(newRes.constructor === Promise){
+								newRes.then(res => {
+									resolve(res);
+								}, error =>{
+									reject(error);
+								})
+							}else{
+								resolve(newRes);
+							}
+						}
+						return false;
+					}
+					reject(this.hook.error ? this.hook.error(response, option) : response);
+
+				},
+				fail: error =>{
+					reject(this.hook.error ? this.hook.error(error, option) : error);
+
 				}
-				reject(this.hook.error ? this.hook.error(response) : response);
-			}).catch(error => {
-				reject(this.hook.error ? this.hook.error(error) : error);
 			});
 		});
 	}

common/utils/requset.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 11:23:58
+ * @LastEditTime: 2022-04-20 11:03:08
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 
@@ -16,7 +16,13 @@ const BASE_URL = {
 	'release' : '',
 	'prod' : ''
 };
-const successIntercept = (response) =>{
+/**
+ * 接口返回成功结果统一处理
+ * @param {*} response 
+ * @param {*} option 
+ */
+const successIntercept = (response, option) =>{
+	clearRepeat(option)
 	if(response.statusCode === 200){
 		const result = response.data;
 		if(result.code === 'SUCCESS'){
@@ -30,41 +36,87 @@ const successIntercept = (response) =>{
 	}
 	return response;
 }
-const errorIntercept = (error) =>{
+/**
+ * 接口返回错误结果统一处理
+ * @param {*} error 
+ * @param {*} option 
+ */
+const errorIntercept = (error, option) =>{
+	clearRepeat(option)
 	return {message:error.errMsg,code:error.statusCode}
 }
+
+//正在执行的请求标识 
+let repeatFlag = [];
+/**
+ * 验证是否重复请求，没有则添加一条到标记
+ * @param {*} option 
+ */
+const repeatVerify = (option)=>{
+	if(repeatFlag.includes(JSON.stringify(option))){
+		return Promise.reject({message:'请勿频繁操作'});
+	}
+	repeatFlag.push(JSON.stringify(option));
+	return false;
+};
+/**
+ * 清除请求标记
+ * @param {*} option 
+ */
+const clearRepeat = (option) =>{
+	repeatFlag = repeatFlag.filter( i => {
+		return i !== JSON.stringify(option)
+	});
+}
+
 // 不需要token的接口封装
 const MsbRequest = new MsbUniRequest();
 MsbRequest.baseUrl = BASE_URL[ENV];
 
-
 MsbRequest.use('request', (option) => {
+	console.log('option',option);
+	if(option.header.repeat){
+		// 如果当前请求不允许重复调用，则检查重复请求，当前接口有正在请求则不发起请求
+		const isRepeatVerify = repeatVerify(option);
+		if(isRepeatVerify){
+			return isRepeatVerify;
+		}
+	}
 	return option;
 })
 MsbRequest.use('success', successIntercept);
 MsbRequest.use('error', errorIntercept);
 
 
-// 不需要token的接口封装
+
+// 需要token的接口封装
 const MsbRequestTk = new MsbUniRequest();
 MsbRequestTk.baseUrl = BASE_URL[ENV];
 
-
 MsbRequestTk.use('request', (option) => {
 	const token = $store.state.token;
 	if(!token){
+		// 登录状态处理，没有token直接跳转至登录
 		const pages = getCurrentPages();
 		const page = pages[pages.length - 1];
-		page.$Router.replace({path : '/login',query:{h : page.__page__.path}})
+		page.$Router.replace('/login');
 		return Promise.reject({message:'要先登录才能操作哦~'});
 	}else{
-		option.header = {...option.header, Authorization:$store.state.token}
+		option.header = {...option.header, Authorization:$store.state.token};
+		
+		if(option.header.repeat){
+			// 如果当前请求不允许重复调用，则检查重复请求，当前接口有正在请求则不发起请求
+			const isRepeatVerify = repeatVerify(option);
+			if(isRepeatVerify){
+				return isRepeatVerify;
+			}
+		}
 		return option;
 	}
-	
 })
 MsbRequestTk.use('success', successIntercept);
 MsbRequestTk.use('error', errorIntercept);
+
 export {
 	MsbRequest,
 	MsbRequestTk

components/BsChoiceGoods.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 16:45:27
  * @LastEditors: ch
- * @LastEditTime: 2022-04-12 16:47:49
+ * @LastEditTime: 2022-04-19 18:08:43
  * @Description: file content
 -->
 <template>
@@ -22,7 +22,7 @@ export default {
 			loadingStatus : 'loading',
 			listData : [],
 			params : {
-				length : 10,
+				length : 15,
 				pageIndex : 1
 			}
 		}

components/BsPay.vue

@@ -0,0 +1,60 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-04-19 11:37:50
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-19 14:42:49
+ * @Description: file content
+-->
+<template>
+	<UiRadioPicker title="请选择支付方式" :show="show" :options="options" 
+		@close="close"	@confirm="confirm" />
+</template>
+<script>
+import UiRadioPicker from './UiRadioPicker.vue'
+import { ApiPostWxPay } from '@/common/api/order';
+export default {
+	components: { UiRadioPicker },
+	props : {
+		show : {
+			type : Boolean,
+			default : false
+		},
+		order:{
+			type : Object,
+			default : () => ({})
+		}
+	},
+	data(){
+		return {
+			options : [
+				{
+					label : '微信支付',
+					value : 'wxpay'
+				},
+				{
+					label : '支付宝支付',
+					value : 'alipay'
+				}
+			]
+		}
+	},
+	methods:{
+		async confirm(val){
+			const orderId = this.order.orderId;
+			const {error, result} = await ApiPostWxPay({orderId,payTypeEnum:'WXPAY'});
+			if(error){
+				this.$Router.replace(`/payFail?ordId=${orderId}`)
+			}else{
+				this.$Router.replace(`/paySuccess?ordId=${orderId}`)
+			}
+		},
+		close(){
+			this.$emit('update:show',false);
+		}
+	}
+	
+}
+</script>
+<style lang="scss" scoped>
+
+</style>

components/UiButton.vue

@@ -2,11 +2,11 @@
  * @Author: ch
  * @Date: 2022-03-26 10:06:38
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 15:43:12
+ * @LastEditTime: 2022-04-19 14:38:07
  * @Description: file content
 -->
 <template>
-	<button :class="`ui-btn ui-btn__${type} ui-btn__${size}${(disabed ? ' ui-btn__disabed' : '')}`" @click="click"><slot></slot></button>
+	<button :class="`ui-btn ui-btn__${type} ui-btn__${size} ${disable ? ' x ui-btn__disabed' : ' xx'}`" @click="click"><slot></slot></button>
 </template>
 <script>
 export default {
@@ -19,7 +19,7 @@ export default {
 			type : String,
 			default : 'normal' //normal 60 max 80 min 50
 		},
-		disabed:{
+		disable:{
 			type : Boolean,
 			default : false
 		}
@@ -71,7 +71,7 @@ export default {
 		border: 1px solid $color-yellow3;
 	}
 	&__disabed{
-		opacity: .8;
+		opacity: .5;
 	}
 }
 </style>

components/UiConfirm.vue

@@ -0,0 +1,56 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-04-19 16:19:32
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-19 17:54:49
+ * @Description: file content
+-->
+<template>
+	<u-modal :show="show" :content="content" showCancelButton 
+		:cancelText="cancelText" :confirmText="confirmText"
+		@confirm="myConfirm" @cancel="myCancel"/>
+</template>
+<script>
+export default {
+	props : {
+		content : {
+			type : String,
+			default : ''
+		},
+		confirmText : {
+			type : String,
+			default : '确认'
+		},
+		confirm : {
+			type : Function,
+			default: function(){}
+		},
+		cancelText : {
+			type : String,
+			default : '取消'
+		},
+		cancel : {
+			type : Function,
+			default : function(){}
+		}
+	},
+	data(){
+		return {
+			show : true
+		}
+	},
+	methods : {
+		async myConfirm(){
+			this.show = false;
+			await this.confirm();
+			document.body.removeChild(this.$el);
+			
+		},
+		async myCancel(){
+			this.show = false;
+			await this.cancel();
+			document.body.removeChild(this.$el);
+		}
+	}
+}
+</script>

components/UiRadioPicker.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-12 10:37:24
  * @LastEditors: ch
- * @LastEditTime: 2022-04-12 13:37:57
+ * @LastEditTime: 2022-04-19 14:38:12
  * @Description: file content
 -->
 <template>
@@ -15,9 +15,8 @@
 			</UiCell>
 		</radio-group>
 		<view class="ui-select--footer">
-			<UiButton type="gradual" size="max" @click="confirm">确认</UiButton>
+			<UiButton type="gradual" size="max" :disable="!selected.value" @click="confirm">确认</UiButton>
 		</view>
-		
 	</u-popup>
 </template>
 <script>
@@ -57,10 +56,15 @@ export default {
 			this.selected = this.options.find(item => val.detail.value === item.value);
 		},
 		confirm(){
-			this.close();
+			if(!this.selected.value){
+				return false;
+			}
 			this.$emit('input', this.selected);
+			this.$emit('confirm', this.selected);
+			this.close();
 		},
 		close(){
+			this.$emit('close');
 			this.$emit('update:show', false);
 		}
 	}

components/UiWhiteBox.vue

@@ -2,16 +2,16 @@
  * @Author: ch
  * @Date: 2022-03-31 15:42:55
  * @LastEditors: ch
- * @LastEditTime: 2022-03-31 16:23:32
+ * @LastEditTime: 2022-04-19 13:57:30
  * @Description: file content
 -->
 <template>
-	<view class="uiWhiteBox">
+	<view class="ui-white-box">
 		<slot></slot>
 	</view>
 </template>
 <style lang="scss" scoped>
-.uiWhiteBox{
+.ui-white-box{
 	margin: 20rpx 30rpx;
 	background: $color-grey0;
 	border-radius: 20rpx;

components/mount/index.js

@@ -0,0 +1,39 @@
+/*
+ * @Author: ch
+ * @Date: 2022-04-19 16:14:03
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-19 17:20:08
+ * @Description: file content
+ */
+import Confirm from '../UiConfirm.vue';
+
+export default {
+  install (Vue) {
+    // 创建构造类
+    const ConfirmConstructor = Vue.extend(Confirm)
+
+    const showNextConfirm = function (options) {
+      // 实例化组件
+      const instance = new ConfirmConstructor({
+        el: document.createElement('div')
+      })
+      // 处理参数
+      for (const prop in options) {
+        instance[prop] = options[prop];
+	  }
+      // 插入Body
+      document.body.appendChild(instance.$el)
+      Vue.nextTick(() => {
+        instance.show = true
+      })
+    }
+
+   const confirmFn = (options) => {
+	   return showNextConfirm(options);
+   }
+	Vue.prototype.$msb ? 
+	Vue.prototype.$msb.confirm = confirmFn : 
+	Vue.prototype.$msb={confirm : confirmFn }
+	
+  }
+}

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.a572362a.js></script><script src=/static/js/index.c845cec7.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.70f3e4b8.js></script></body></html>

h5/static/js/pages-cart-cart.7f77a7cd.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-cart"],{"0ba2":function(n,t,a){"use strict";var e=a("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=e(a("734f")),c={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=c},"0ddb":function(n,t,a){var e=a("24fb");t=e(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-529a9cda]{background:#f5f5f5;padding-bottom:%?120?%}body.?%PAGE?%[data-v-529a9cda]{background:#f5f5f5}',""]),n.exports=t},"4a3c":function(n,t,a){"use strict";var e=a("c267"),r=a.n(e);r.a},b408:function(n,t,a){"use strict";var e;a.d(t,"b",(function(){return r})),a.d(t,"c",(function(){return c})),a.d(t,"a",(function(){return e}));var r=function(){var n=this,t=n.$createElement,a=n._self._c||t;return a("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"inner"}})},c=[]},c267:function(n,t,a){var e=a("0ddb");"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var r=a("4f06").default;r("1edb3d4a",e,!0,{sourceMap:!1,shadowMode:!1})},e81f:function(n,t,a){"use strict";a.r(t);var e=a("0ba2"),r=a.n(e);for(var c in e)"default"!==c&&function(n){a.d(t,n,(function(){return e[n]}))}(c);t["default"]=r.a},f662:function(n,t,a){"use strict";a.r(t);var e=a("b408"),r=a("e81f");for(var c in r)"default"!==c&&function(n){a.d(t,n,(function(){return r[n]}))}(c);a("4a3c");var o,u=a("f0c5"),s=Object(u["a"])(r["default"],e["b"],e["c"],!1,null,"529a9cda",null,!1,e["a"],o);t["default"]=s.exports}}]);

h5/static/js/pages-cart-tabBarCart.ba2beba7.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-tabBarCart"],{1266:function(n,t,e){"use strict";e.r(t);var a=e("bcdd"),r=e("fb42");for(var f in r)"default"!==f&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("9a1ff");var o,u=e("f0c5"),s=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,"761ed496",null,!1,a["a"],o);t["default"]=s.exports},1952:function(n,t,e){var a=e("24fb");t=a(!1),t.push([n.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 透明度 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 间距 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */uni-page-body[data-v-761ed496]{background:#f5f5f5;padding-bottom:%?240?%}body.?%PAGE?%[data-v-761ed496]{background:#f5f5f5}',""]),n.exports=t},"26d2":function(n,t,e){var a=e("1952");"string"===typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);var r=e("4f06").default;r("73cf590f",a,!0,{sourceMap:!1,shadowMode:!1})},"9a1ff":function(n,t,e){"use strict";var a=e("26d2"),r=e.n(a);r.a},bcdd:function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return f})),e.d(t,"a",(function(){return a}));var r=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("PageCtx",{ref:"page",staticClass:"page",attrs:{type:"tabBar"}})},f=[]},e625:function(n,t,e){"use strict";var a=e("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a(e("734f")),f={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=f},fb42:function(n,t,e){"use strict";e.r(t);var a=e("e625"),r=e.n(a);for(var f in a)"default"!==f&&function(n){e.d(t,n,(function(){return a[n]}))}(f);t["default"]=r.a}}]);