Merge branch 'dev1.0.0' into develop

App.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-04-01 01:47:12
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 10:44:33
+ * @LastEditTime: 2022-04-22 14:47:06
  * @Description: file content
 -->
 <script>
@@ -30,5 +30,12 @@
 		font-size: $font-size-base;
 		color: $color-grey6;
 	}
+	body{
+		padding-bottom: constant(safe-area-inset-bottom);
+		/* 兼容 iOS < 11.2 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* 兼容 iOS >= 11.2 */
+	}
+
 	
 </style>

common/plugins/msbUniRequest.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 16:36:59
  * @LastEditors: ch
- * @LastEditTime: 2022-04-20 16:07:24
+ * @LastEditTime: 2022-04-22 20:30:03
  * @Description: 针对uniapp request请求做了一次封装，使用思维参考axios
  * 
  * 
@@ -81,7 +81,7 @@ class MsbUniRequest {
 						}else{
 							let newRes = this.hook.success(response, option);
 							// 业务结果处理可能为一个Promise对象，根据结果调用错误或正确状态
-							if(newRes.constructor === Promise){
+							if(newRes && newRes.constructor === Promise){
 								newRes.then(res => {
 									resolve(res);
 								}, error =>{

common/utils/requset.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-04-22 11:12:36
+ * @LastEditTime: 2022-04-22 16:37:06
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 

components/BsEmpty.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 13:11:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 16:00:40
+ * @LastEditTime: 2022-04-22 11:37:16
  * @Description: file content
 -->
 <template>
@@ -59,7 +59,8 @@ export default {
 	}
 
 	&--icon {
-		width: 280rpx;
+		width: 380rpx;
+		height: 240rpx;
 	}
 }
 </style>

components/BsPay.vue

@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-04-19 11:37:50
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 14:42:49
+ * @LastEditTime: 2022-04-22 18:11:00
  * @Description: file content
 -->
 <template>
 	<UiRadioPicker title="请选择支付方式" :show="show" :options="options" 
-		@close="close"	@confirm="confirm" />
+		@close="close" @confirm="confirm" />
 </template>
 <script>
 import UiRadioPicker from './UiRadioPicker.vue'

components/UiButton.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-26 10:06:38
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 14:38:07
+ * @LastEditTime: 2022-04-22 20:07:26
  * @Description: file content
 -->
 <template>
@@ -26,7 +26,7 @@ export default {
 	},
 	methods:{
 		click(){
-			!this.disabed && this.$emit('click');
+			!this.disable && this.$emit('click');
 		}
 	}
 }
@@ -36,18 +36,25 @@ export default {
 	display: inline-block;
 	padding: 0 50rpx;
 	border-radius: 50rpx;
+	&::after{
+		display: none;
+	}
 	&__normal{
 		height: 70rpx;
 		line-height: 70rpx;
 		font-size: $font-size-base;
 	}
 	&__min{
+		height: 60rpx;
+		line-height: 60rpx;
+		font-size: $font-size-base;
+	}
+	&__small{
 		height: 50rpx;
 		line-height: 50rpx;
 		font-size: $font-size-base;
 	}
 	&__max{
-		width: 690rpx;
 		height: 80rpx;
 		line-height: 80rpx;
 		font-size: $font-size-lg;
@@ -63,7 +70,7 @@ export default {
 	&__line{
 		background: none;
 		color: $color-grey6;
-		border: 1px solid rgb(192, 185, 185);
+		border: 1px solid $color-grey4;
 	}
 	&__primaryLine{
 		background: none;

components/UiCell.vue

@@ -2,21 +2,21 @@
  * @Author: ch
  * @Date: 2022-03-26 18:29:19
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:01:40
+ * @LastEditTime: 2022-04-22 15:54:57
  * @Description: file content
 -->
 <template>
-	<view class="uiCell" @click="$emit('click')">
+	<view class="ui-cell" @click="$emit('click')">
 		<slot name="icon"></slot>
-		<view class="uiCell--left">
+		<view class="ui-cell--left">
-			<text class="uiCell--title">{{title}}</text>
+			<text class="ui-cell--title">{{title}}</text>
-			<text class="uiCell--label">{{label}}</text>
+			<text class="ui-cell--label" v-if="label">{{label}}</text>
 		</view>
 		<slot name="value">
-			<text class="uiCell--value">{{value}}</text>
+			<text class="ui-cell--value">{{value}}</text>
 		</slot>
 		<slot name="right-icon" v-if="rightIcon">
-			<image class="uiCell--rightIcon" src="@/static/common/arrow.png"/>
+			<image class="ui-cell--rightIcon" src="@/static/common/arrow.png"/>
 		</slot>
 	</view>
 </template>
@@ -43,9 +43,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.uiCell{
+.ui-cell{
 	min-height: 100rpx;
-	border-bottom: 1px solid $color-grey2;
+	border-bottom: 1px solid $color-grey1;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
@@ -53,6 +53,7 @@ export default {
 	&--title{
 		color: $color-grey6;
 		font-size: $font-size-base;
+		line-height: $font-size-base;
 		display: block;
 	}
 	&--label{

components/UiGoodsInfo.vue

@@ -2,17 +2,17 @@
  * @Author: ch
  * @Date: 2022-03-31 14:49:33
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 16:27:29
+ * @LastEditTime: 2022-04-22 18:24:57
  * @Description: file content
 -->
 <template>
 	<view class="ui-goods">
 		<view class="ui-goods-item">
-			<image class="ui-goods-item--image" mode="widthFix" :src="data.productImageUrl" />
+			<image class="ui-goods-item--image" mode="aspectFit" :src="data.productImageUrl" />
 			<view class="ui-goods-item--right">
 				<view class="ui-goods-item--con">
 					<text class="ui-goods-item--title">{{data.productName}}</text>
-					<UiMoney :money="data.realAmount"></UiMoney>
+					<UiMoney :money="data.realAmount" prefix float suffix></UiMoney>
 				</view>
 				<view class="ui-goods-item--desc">
 					<text>{{data.skuDescribe}}</text>
@@ -59,11 +59,13 @@ export default {
 		line-height: 39rpx;
 	}
 	&--title{
+		width: 300rpx;
 		overflow:hidden; 
 		text-overflow:ellipsis;
 		display:-webkit-box; 
 		-webkit-box-orient:vertical;
 		-webkit-line-clamp:2; 
+		font-weight: bold;
 	}
 	&--pirce{
 		font-size: 22rpx;
@@ -86,4 +88,15 @@ export default {
 		}
 	}
 }
+/deep/{
+	.ui-money{
+		text{
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+		.ui-money--prefix,.ui-money--suffix{
+			font-size: $font-size-sm;
+		}
+	}
+}
 </style>

components/UiGoodsInfoMax.vue

@@ -0,0 +1,96 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-04-22 16:48:11
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-22 17:03:48
+ * @Description: file content
+-->
+<template>
+	<view class="goods-item">
+		<image class="goods-item--image" mode="aspectFit" :src="data.productImageUrl" />
+		<view class="goods-item--con">
+			<view class="goods-item--title-box">
+				<text class="goods-item--title">{{data.productName}}</text>
+				<UiMoney :money="data.realAmount" float prefix suffix/>
+				<!-- <text class="goods-item--pirce">￥{{data.realAmount}}</text> -->
+			</view>
+			<view class="goods-item--desc">
+				<text>{{data.skuDescribe}}</text>
+				<text class="goods-item--num">x{{data.quantity}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import UiMoney from './UiMoney.vue'
+export default {
+	components: { UiMoney },
+	props : {
+		data : {
+			type : Object,
+			default : ()=> ({})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.goods-item{
+	display: flex;
+	justify-content: space-between;
+	padding: 30rpx 0 0;
+
+	&--image{
+		width: 180rpx;
+		height: 180rpx;
+	}
+	&--con{
+		width: 480rpx;
+	}
+	&--title-box{
+		display: flex;
+		justify-content: space-between;
+		font-size: $font-size-base;
+		color: $color-grey6;
+		line-height: 39rpx;
+	}
+	&--title{
+		width: 320rpx;
+		overflow:hidden; 
+		text-overflow:ellipsis;
+		display:-webkit-box; 
+		-webkit-box-orient:vertical;
+		-webkit-line-clamp:2; 
+		font-weight: bold;
+	}
+	&--pirce{
+		font-size: 22rpx;
+		margin-left: 60rpx;
+	}
+	&--desc{
+		margin-top: 20rpx;
+		line-height: 39rpx;
+		display: flex;
+		justify-content: space-between;
+		text{
+			font-size: $font-size-sm;
+			color: $color-grey4;
+		}
+	}
+	&--num{
+		font-size: $font-size-base;
+		margin-left: 60rpx;
+	}
+}
+/deep/{
+	.ui-money{
+		text{
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+		.ui-money--prefix,.ui-money--suffix{
+			font-size: $font-size-sm;
+		}
+
+	}
+}
+</style>

components/UiMoney.vue

@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-04-21 09:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 17:44:58
+ * @LastEditTime: 2022-04-22 19:43:05
  * @Description: file content
 -->
 <template>
 	<view class="ui-money">
 		<text v-if="prefix" class="ui-money--prefix">￥</text>
 		<text class="ui-money--price">{{moneyStr}}</text>
-		<text v-if="flaot && suffix" class="ui-money--suffix">.{{moneyArr[1]}}</text>
+		<text v-if="float && suffix" class="ui-money--suffix">.{{moneyArr[1]}}</text>
 	</view>
 </template>
 <script>
@@ -19,7 +19,7 @@ export default {
 			type : Number | String,
 			default : '0'
 		},
-		flaot : {
+		float : {
 			type : Boolean,
 			default : false
 		},
@@ -52,15 +52,13 @@ export default {
 		moneyArr (){
 			let moneyArr = (this.money || '0').toString().split('.');
 			// 如果需要补0 则整数时补00
-			console.log(this.flaot);
+			if(this.float){
-			if(this.flaot){
 				if(!moneyArr[1]){
 					moneyArr[1] = '00';
 				}else if(moneyArr[1] < 10){
 					moneyArr[1] = `0${moneyArr[1]}`;
 				}
 			}
-			console.log(moneyArr);
 			return moneyArr;
 		}
 

components/UiPageHeader.vue

@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-03-25 10:11:37
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 15:27:05
+ * @LastEditTime: 2022-04-22 14:16:14
  * @Description: file content
 -->
 <template>
 	<view class="header">
-		<image class="header--back" v-if="back" src="@/static/search/arrow.png" @click="$Router.back()"></image>
+		<image class="header--back" v-if="back" src="@/static/common/back.png" @click="$Router.back()"></image>
 		<slot name="custom">
 			<text class="header--title">{{title}}</text>
 			<view class="header--operation">

components/UiRadioPicker.vue

@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-04-12 10:37:24
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 14:38:12
+ * @LastEditTime: 2022-04-22 18:13:08
  * @Description: file content
 -->
 <template>
 	<u-popup :show="show" @close="close" round="16rpx" closeable>
 		<view class="ui-select--title" v-if="title">{{title}}</view>
-		<radio-group class="ui-select--cell" @change="change">
+		<radio-group class="ui-select--cell">
-			<UiCell :title="item.label" v-for="item in options" :key="item.value">
+			<UiCell :title="item.label" v-for="item in options" @click="change(item)" :key="item.value">
 				<radio slot="right-icon" class="ui-select--radio" color="#FF875B"
 					:value="item.value" :checked="item.value === selected.value"/>
 			</UiCell>
@@ -53,7 +53,7 @@ export default {
 	},
 	methods:{
 		change(val){
-			this.selected = this.options.find(item => val.detail.value === item.value);
+			this.selected = this.options.find(item => val.value === item.value);
 		},
 		confirm(){
 			if(!this.selected.value){
@@ -87,6 +87,9 @@ export default {
 		padding: 68rpx 40rpx;
 		display: flex;
 		justify-content: space-between;
+		.ui-btn{
+			width: 690rpx;
+		}
 	}
 }
 </style>

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.59b54823.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.27db4afe.js></script></body></html>

h5/static/js/pages-cart-cart.9828acc3.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-cart"],{"01b6":function(n,t,a){var e=a("b71b");"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var r=a("4f06").default;r("63575d96",e,!0,{sourceMap:!1,shadowMode:!1})},"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")),f={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=f},4772:function(n,t,a){"use strict";var e;a.d(t,"b",(function(){return r})),a.d(t,"c",(function(){return f})),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"}})},f=[]},b71b: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-553a5063]{background:#f5f5f5;padding-bottom:%?120?%}body.?%PAGE?%[data-v-553a5063]{background:#f5f5f5}',""]),n.exports=t},e81f:function(n,t,a){"use strict";a.r(t);var e=a("0ba2"),r=a.n(e);for(var f in e)"default"!==f&&function(n){a.d(t,n,(function(){return e[n]}))}(f);t["default"]=r.a},f662:function(n,t,a){"use strict";a.r(t);var e=a("4772"),r=a("e81f");for(var f in r)"default"!==f&&function(n){a.d(t,n,(function(){return r[n]}))}(f);a("faf9");var o,u=a("f0c5"),s=Object(u["a"])(r["default"],e["b"],e["c"],!1,null,"553a5063",null,!1,e["a"],o);t["default"]=s.exports},faf9:function(n,t,a){"use strict";var e=a("01b6"),r=a.n(e);r.a}}]);

h5/static/js/pages-cart-cart.bcd765b4.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")),o={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=o},"432d":function(n,t,a){"use strict";var e=a("454a"),r=a.n(e);r.a},"454a":function(n,t,a){var e=a("87ca");"string"===typeof e&&(e=[[n.i,e,""]]),e.locals&&(n.exports=e.locals);var r=a("4f06").default;r("5216c871",e,!0,{sourceMap:!1,shadowMode:!1})},"7aa7":function(n,t,a){"use strict";var e;a.d(t,"b",(function(){return r})),a.d(t,"c",(function(){return o})),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"}})},o=[]},"87ca":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-583df840]{background:#f5f5f5;padding-bottom:%?120?%}body.?%PAGE?%[data-v-583df840]{background:#f5f5f5}',""]),n.exports=t},e81f:function(n,t,a){"use strict";a.r(t);var e=a("0ba2"),r=a.n(e);for(var o in e)"default"!==o&&function(n){a.d(t,n,(function(){return e[n]}))}(o);t["default"]=r.a},f662:function(n,t,a){"use strict";a.r(t);var e=a("7aa7"),r=a("e81f");for(var o in r)"default"!==o&&function(n){a.d(t,n,(function(){return r[n]}))}(o);a("432d");var u,f=a("f0c5"),c=Object(f["a"])(r["default"],e["b"],e["c"],!1,null,"583df840",null,!1,e["a"],u);t["default"]=c.exports}}]);

h5/static/js/pages-cart-tabBarCart.883897cd.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("b083"),r=e("fb42");for(var c in r)"default"!==c&&function(n){e.d(t,n,(function(){return r[n]}))}(c);e("6d78");var o,u=e("f0c5"),s=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,"34c6335c",null,!1,a["a"],o);t["default"]=s.exports},"6d78":function(n,t,e){"use strict";var a=e("cb06"),r=e.n(a);r.a},b083:function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return c})),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"}})},c=[]},bd34: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-34c6335c]{background:#f8f8f8;padding-bottom:%?240?%}body.?%PAGE?%[data-v-34c6335c]{background:#f8f8f8}',""]),n.exports=t},cb06:function(n,t,e){var a=e("bd34");"string"===typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);var r=e("4f06").default;r("725e2431",a,!0,{sourceMap:!1,shadowMode:!1})},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")),c={components:{PageCtx:r.default},onShow:function(){this.$refs.page&&this.$refs.page.open()},mounted:function(){this.$refs.page.open()}};t.default=c},fb42:function(n,t,e){"use strict";e.r(t);var a=e("e625"),r=e.n(a);for(var c in a)"default"!==c&&function(n){e.d(t,n,(function(){return a[n]}))}(c);t["default"]=r.a}}]);

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

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-cart-tabBarCart"],{1266:function(n,t,e){"use strict";e.r(t);var a=e("93ad"),r=e("fb42");for(var f in r)"default"!==f&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("9dc8");var o,u=e("f0c5"),s=Object(u["a"])(r["default"],a["b"],a["c"],!1,null,"30eeb2f8",null,!1,a["a"],o);t["default"]=s.exports},"93ad":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=[]},"9dc8":function(n,t,e){"use strict";var a=e("f1d5"),r=e.n(a);r.a},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},ea7e: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-30eeb2f8]{background:#f8f8f8;padding-bottom:%?240?%}body.?%PAGE?%[data-v-30eeb2f8]{background:#f8f8f8}',""]),n.exports=t},f1d5:function(n,t,e){var a=e("ea7e");"string"===typeof a&&(a=[[n.i,a,""]]),a.locals&&(n.exports=a.locals);var r=e("4f06").default;r("c8eb01e4",a,!0,{sourceMap:!1,shadowMode:!1})},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}}]);

pages.json

@@ -15,7 +15,7 @@
 			"aliasPath" : "/login",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -23,7 +23,7 @@
 			"aliasPath" : "/seckill",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -31,7 +31,7 @@
 			"aliasPath" : "/category",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -39,7 +39,7 @@
 			"aliasPath" : "/search",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -47,7 +47,7 @@
 			"aliasPath" : "/goodsList",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -55,7 +55,7 @@
 			"aliasPath" : "/goodsDetail",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -63,7 +63,7 @@
 			"aliasPath" : "/account",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -72,7 +72,7 @@
 			"aliasPath" : "/cart",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -81,7 +81,7 @@
 			"aliasPath" : "/tabBarCart",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -229,7 +229,7 @@
 		{
 			"path": "pages/account/message/list",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		}
 	],
@@ -237,7 +237,7 @@
 		"color": "#BBBBBB",
 		"selectedColor": "#FF875B",
 		"backgroundColor": "#FFF",
-		"borderStyle" : "white",
+		"borderStyle" : "#eee",
 		"fontSize" : "24rpx",
 		"height" : "120rpx",
 		"list": [

pages/account/address/create.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 14:12:18
  * @LastEditors: ch
- * @LastEditTime: 2022-04-20 19:23:18
+ * @LastEditTime: 2022-04-22 19:04:06
  * @Description: file content
 -->
 <template>
@@ -119,9 +119,10 @@ page {
 	position: fixed;
 	bottom: 89rpx;
 	left: 30rpx;
+	width: 670rpx;
 }
 /deep/ {
-	.form--city .uiCell{
+	.form--city .ui-cell{
 		padding: 0 40rpx;
 	}
 }

pages/account/address/edit.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 14:12:18
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 21:14:45
+ * @LastEditTime: 2022-04-22 19:04:16
  * @Description: file content
 -->
 <template>
@@ -138,12 +138,13 @@ page {
 	position: fixed;
 	bottom: 89rpx;
 	left: 30rpx;
+	width: 670rpx;
 }
 /deep/ {
 	.del-address .uiCell--title{
 		color: $color-yellow3;
 	}
-	.form--city .uiCell{
+	.form--city .ui-cell{
 		padding: 0 40rpx;
 	}
 }

pages/account/address/list.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 13:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 21:01:49
+ * @LastEditTime: 2022-04-22 18:58:37
  * @Description: file content
 -->
 <template>
@@ -166,13 +166,6 @@ page{
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	&::before{
+	width: 670rpx;
-		display: inline-block;
-		content: "+";
-		margin-right: 20rpx;
-		font-size: 46rpx;
-		font-weight: bold;
-		padding-top: 10rpx;
-	}
 }
 </style>