Merge branch 'dev1.0.0' into develop

common/utils/requset.js

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

components/BsChoiceGoods.vue

@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-03-20 16:45:27
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 18:08:43
+ * @LastEditTime: 2022-04-21 16:48:27
  * @Description: file content
 -->
 <template>
 	<view>
 		<UiGoodsGroup :listData="listData"></UiGoodsGroup>
-		<u-loadmore :status="loadingStatus"  nomoreText="我也是有底线的啦~"/>
+		<u-loadmore :status="loadingStatus" color="#ccc" nomoreText="我也是有底线的啦~" />
 	</view>
 </template>
 <script>

components/BsEmpty.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 13:11:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-07 15:34:03
+ * @LastEditTime: 2022-04-21 16:00:40
  * @Description: file content
 -->
 <template>
@@ -46,10 +46,11 @@ export default {
 <style lang="scss" scoped>
 .empty {
 	box-sizing: border-box;
-	width: 100%;
 	padding: 50rpx;
 	text-align: center;
 	background: $color-grey0;
+	margin: 20rpx 30rpx;
+	border-radius: 16rpx;
 
 	&--tips {
 		font-size: 26rpx;

components/UiGoodsGroup.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-07 17:22:44
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:02:28
+ * @LastEditTime: 2022-04-21 16:38:03
  * @Description: file content
 -->
 
@@ -14,10 +14,11 @@
 					<image class="goods-item--img" :src="item.mainPicture" mode="widthFix"></image>
 					<view class="goods-item--title"><text>{{item.name}}</text></view>
 					<view class="goods-item--pirce-box">
-						<view>
+						<UiMoney :money="item.startingPrice" prefix class="goods-item--pirce"/>
+						<!-- <view>
 							<text class="goods-item--pirce">￥{{item.startingPrice}}</text>
-							<!-- <text class="goods-item--original-pirce">￥50</text> -->
-						</view>
+							<text class="goods-item--original-pirce">￥50</text>
+						</view> -->
 						<!-- <view>
 							<image class="goods-item--icon" src='@/static/index/bz.png'></image>
 						</view> -->
@@ -34,10 +35,11 @@
 					<image class="goods-item--img" :src="item.mainPicture" mode="widthFix"></image>
 					<view class="goods-item--title"><text>{{item.name}}</text></view>
 					<view class="goods-item--pirce-box">
-						<view>
+						<UiMoney :money="item.startingPrice" prefix class="goods-item--pirce"/>
+						<!-- <view>
 							<text class="goods-item--pirce">￥{{item.startingPrice}}</text>
-							<!-- <text class="goods-item--original-pirce">￥50</text> -->
-						</view>
+							<text class="goods-item--original-pirce">￥50</text>
+						</view> -->
 						<!-- <view>
 							<image class="goods-item--icon" src='@/static/index/bz.png'></image>
 						</view> -->
@@ -51,7 +53,9 @@
 		</view>
 </template>
 <script>
+import UiMoney from './UiMoney.vue';
 export default {
+	components: { UiMoney },
 	data(){
 		return {
 			// goodsLeftData : [],
@@ -130,18 +134,15 @@ export default {
 		}
 		&--title{
 			font-size: $font-size-base;
-			padding: 20rpx 20rpx;
+			padding: 20rpx 20rpx 24rpx;
 			line-height: 36rpx;
+			font-weight: bold;
 		}
 		&--pirce-box{
 			padding:0 20rpx;
 			display: flex;
 			justify-content: space-between;
 		}
-		&--pirce{
-			font-size: $font-size-lg;
-			color: $color-yellow4;
-		}
 		&--original-pirce{
 			color: $color-grey3;
 			font-size: 20rpx;
@@ -176,4 +177,18 @@ export default {
 		}
 	}
 }
+/deep/ {
+	.goods-item--pirce{
+		text{
+			font-size: $font-size-lg;
+			line-height: 32rpx;
+			color: $color-yellow4;
+			font-weight: bold;
+		}
+		.ui-money--prefix{
+			font-size: $font-size-sm;
+		}
+	}
+
+}
 </style>

components/UiGoodsInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:49:33
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 10:01:14
+ * @LastEditTime: 2022-04-21 16:27:29
  * @Description: file content
 -->
 <template>
@@ -12,7 +12,7 @@
 			<view class="ui-goods-item--right">
 				<view class="ui-goods-item--con">
 					<text class="ui-goods-item--title">{{data.productName}}</text>
-					<text class="ui-goods-item--pirce">￥{{data.realAmount}}</text>
+					<UiMoney :money="data.realAmount"></UiMoney>
 				</view>
 				<view class="ui-goods-item--desc">
 					<text>{{data.skuDescribe}}</text>
@@ -25,7 +25,9 @@
 	</view>
 </template>
 <script>
+import UiMoney from './UiMoney.vue'
 export default {
+	components: { UiMoney },
 	props : {
 		data : {
 			type : Object,

components/UiMoney.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-21 09:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 10:59:21
+ * @LastEditTime: 2022-04-21 15:41:48
  * @Description: file content
 -->
 <template>
@@ -50,7 +50,7 @@ export default {
 			return priceStr;
 		},
 		moneyArr (){
-			let moneyArr = this.money.toString().split('.');
+			let moneyArr = (this.money || '0').toString().split('.');
 			// 如果需要补0 则整数时补00
 			if(this.flaot){
 				if(!moneyArr[1]){
@@ -66,4 +66,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.ui-money{
+	// display: flex;
+	align-items: center;
+	text{
+		// display: block;
+		line-height: initial;
+	}
+}
 </style>

components/UiPageHeader.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-25 10:11:37
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:02:30
+ * @LastEditTime: 2022-04-21 15:27:05
  * @Description: file content
 -->
 <template>
@@ -37,7 +37,7 @@ export default {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	background: $color-grey0;
+	background: $color-grey1;
     position: sticky;
     top: var(--window-top);
 	z-index: 999;
@@ -49,7 +49,8 @@ export default {
 	&--title{
 		flex: 1;
 		text-align: center;
-		font-size: $font-size-lg;
+		font-size: 36rpx;
+		font-weight: bold;
 	}
 	&--operation{
 		position: absolute;

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.8a30f788.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.6597793b.js></script></body></html>

h5/static/js/pages-cart-tabBarCart.41dde9fd.js

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

h5/static/js/pages-cart-tabBarCart.ba2beba7.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("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}}]);

pages/account/address/list.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 13:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-20 15:32:04
+ * @LastEditTime: 2022-04-21 14:18:12
  * @Description: file content
 -->
 <template>
@@ -72,16 +72,6 @@ export default {
 			}
 			this.addresList = result;
 			this.$store.commit('SET_ADDRESS', result);
-
-			// 如果是提交订单且是创建地址则直接选中默认或第一个地址，并返回
-			if(this.query.source=== 'submitOrder' && this.query.status === 'created'){
-				if(result.length){
-					uni.$emit('changeAddress',result.find(i => i.isDefault) || result[0], this.query.source);
-				}else{
-					uni.$emit('changeAddress',{}, this.query.source);
-				}
-			}
-			
 		},
 		/**
 		 * 选择地址

pages/cart/components/PageCtx.vue

@@ -3,12 +3,14 @@
 		<!-- 页面顶部 -->
 		<UiPageHeader :back="type == 'inner'" :class="`head__${type}`">
 			<template slot="custom">
-				<view :class="`head--title`">
+				<view class="head--title">
 					<text>购物车</text>
 					<text v-if="list.length">({{list.length}})</text>
 				</view>
-				<view v-if="mode == 'normal'" class="head--edit" @click="handleToggleMode">编辑</view>
-				<view v-else class="head--finish" @click="handleToggleMode">完成</view>
+				<template v-if="list.length">
+					<view v-if="mode == 'normal'" class="head--edit" @click="handleToggleMode">编辑</view>
+					<view v-else class="head--finish" @click="handleToggleMode">完成</view>
+				</template>
 			</template>
 		</UiPageHeader>
 
@@ -21,26 +23,19 @@
 		</BsEmpty>
 
 		<!-- 购物车商品列表 -->
-		<view v-else class="cart-list">
-			<view class="cart-item" v-for="(item, index) in list" :key="index" 
-				@click="$Router.push(`/goodsDetail?id=${item.id}`)">
+		<template v-else >
+			<UiWhiteBox class="cart-item" v-for="(item, index) in list" :key="index" >
 				<label class="cart-item--radio" @click.stop="handleCheckItem(item.id)">
 					<radio class="radio" color="#FF875B" 
 						:checked="checkedIds.length ? checkedIds.includes(item.id) : false" />
 				</label>
-				<image class="cart-item--image" :src="item.product.mainPicture" mode="scaleToFill"></image>
-				<view class="cart-item--content">
-					<view class="cart-item--title"><text>{{ item.product.name }}</text></view>
-					<view class="cart-item--props">
-						<view class="cart-item--props-item" >
-							<text>{{ item.productSku.name }}</text>
-						</view>
-					</view>
+				<image class="cart-item--image" :src="item.product.mainPicture" mode="scaleToFill" 
+					@click="$Router.push(`/goodsDetail?id=${item.productId}`)"></image>
+				<view class="cart-item--content" @click="$Router.push(`/goodsDetail?id=${item.productId}`)">
+					<view class="cart-item--title">{{ item.product.name }}</view>
+					<view class="cart-item--props">{{ item.productSku.name }}</view>
 					<view class="cart-item--footer">
-						<view class="cart-item--price">
-							<text class="unit">￥</text>
-							<text class="value">{{ item.productSku.sellPrice }}</text>
-						</view>
+						<UiMoney class="cart-item--price" :money="item.productSku.sellPrice" prefix></UiMoney>
 						<view class="cart-item--stepper">
 							<u-number-box :min="1" button-size="40rpx" bgColor="#F5F6FA" 
 								:value="item.number" :max="item.maxBuyNum" @change="onChangeStepper($event, item)" >
@@ -50,8 +45,8 @@
 						</view>
 					</view>
 				</view>
-			</view>
-		</view>
+			</UiWhiteBox>
+		</template>
 		
 		<template v-if="!isLoading">
 			<view class="title">为您推荐</view>
@@ -61,30 +56,17 @@
 		<!-- 底部操作栏 -->
 		<view v-if="list.length" :class="`footer footer__${type}`">
 			<label class="all-radio" @click="handleCheckAll">
-				<radio class="radio" color="#FF875B" 
+				<radio class="radio" color="#FF875B"
 					:checked="checkedIds.length > 0 && checkedIds.length === list.length" />
 				<text>全选</text>
 			</label>
 			<view class="total-info">
 				<text>合计：</text>
-				<view class="goods-price">
-					<text class="unit">￥</text>
-					<text class="value">{{ totalPrice }}</text>
-				</view>
+				<UiMoney class="goods-price" :money="totalPrice" prefix/>
 			</view>
 			<view class="cart-action">
-				<view class="btn-wrapper">
-					<!-- dev:下面的disabled条件使用checkedIds.join方式判断 -->
-					<!-- dev:通常情况下vue项目使用checkedIds.length更合理, 但是length属性在微信小程序中不起作用 -->
-					<view v-if="mode == 'normal'" class="btn-item btn-main" :class="{ disabled: checkedIds.length === 0 }"
-						@click="handleOrder()">
-						<text>去结算 {{ checkedIds.length > 0 ? `(${checkedIds.length})` : '' }}</text>
-					</view>
-					<view v-if="mode == 'edit'" class="btn-item btn-main" :class="{ disabled: !checkedIds.length }"
-						@click="handleDelete()">
-						<text>删除</text>
-					</view>
-				</view>
+				<UiButton v-if="mode == 'edit'" :disable="!checkedIds.length" @click="handleDelete">删除</UiButton>
+				<UiButton v-else type="gradual" :disable="!checkedIds.length" @click="handleOrder">去结算({{list.length}})</UiButton>
 			</view>
 		</view>
 	</view>
@@ -96,6 +78,9 @@ import BsEmpty from '@/components/BsEmpty.vue';
 import BsChoiceGoods from '@/components/BsChoiceGoods.vue';
 import UiPageHeader from '@/components/UiPageHeader.vue';
 import {ApiGetCartList, ApiPutCartNum, ApiDeleteCartGoods} from '@/common/api/cart';
+import UiMoney from '../../../components/UiMoney.vue';
+import UiButton from '../../../components/UiButton.vue';
+import UiWhiteBox from '../../../components/UiWhiteBox.vue';
 
 const CartIdsIndex = 'CartIds';
 
@@ -103,7 +88,10 @@ export default {
     components: {
         BsEmpty,
         BsChoiceGoods,
-        UiPageHeader
+        UiPageHeader,
+        UiMoney,
+        UiButton,
+        UiWhiteBox
 	},
 	props : {
 		type : {
@@ -280,32 +268,30 @@ export default {
 			const ids = this.checkedIds;
             if (!ids.length) {
                 return false
-            }
-            uni.showModal({
-                title: '友情提示',
-                content: '您确定要删除该商品吗？',
-                showCancel: true,
-                success:async ()=> {
+			}
+			
+			this.$msb.confirm({
+				content : '您确定要删除该商品吗？',
+				confirm : async ()=>{
 					const {error} = await ApiDeleteCartGoods({idList : ids.join(',')});
 					if(error){
 						uni.$u.toast(error.message);
 						return false;
 					}
 					this.list = this.list.filter(item => !ids.includes(item.id));
-					// this.checkedIds = [];
+					this.checkedIds = [];
 					this.onClearInvalidId();
-
-                }
-            })
+				}
+			})
         }
 
     }
 }
 </script>
 
-<style>
+<style lang="scss">
   page {
-	background: #f5f5f5;
+	background: $color-grey1;
 	padding-bottom: 240rpx;
   }
 </style>
@@ -321,6 +307,9 @@ export default {
     position: sticky;
     top: var(--window-top);
 	z-index: 999;
+	&--title text{
+		font-size: 36rpx;
+	}
 	&--totla{
 		font-size: 36rpx;
 		color: $color-grey6;
@@ -342,17 +331,13 @@ export default {
 
 }
 
-// 购物车列表
-.cart-list {
-	background: $color-grey0;
-}
+// 购物车列
 .cart-item {
 	width: 690rpx;
     display: flex;
     align-items: center;
-    padding: 30rpx 0;
-    margin: 0 auto 24rpx auto;
-    border-bottom: 1px solid $color-grey2;
+    padding: 50rpx 40rpx 40rpx 24rpx;
+    margin: 20rpx auto;
     &--radio {
 		width: 56rpx;
 		height: 80rpx;
@@ -390,7 +375,7 @@ export default {
 	&--props {
         margin-top: 14rpx;
         height: 40rpx;
-        color: #ababab;
+        color: $color-grey4;
         font-size: $font-size-sm;
         overflow: hidden;
 
@@ -405,18 +390,6 @@ export default {
         align-items: center;
         margin-top: 20rpx;
 	}
-	&--price {
-		vertical-align: bottom;
-		color: $color-yellow4;
-
-		.unit {
-			font-size: 20rpx;
-		}
-		.value {
-			font-size: 22rpx;
-			font-weight: bold;
-		}
-	}
 	&--stepper-icon{
 		font-size: 38rpx;
 		color: $color-grey3;
@@ -507,53 +480,28 @@ export default {
 	  padding-right: 30rpx;
 	  font-size: $font-size-sm;
 	  color: $color-grey5;
-
-      .goods-price {
-        vertical-align: bottom;
-        color: $color-yellow3;
-
-        .unit {
-          font-size: $font-size-sm;
-        }
-
-        .value {
-          font-size: $font-size-lg;
-        }
-      }
     }
 
-    .cart-action {
-      width: 200rpx;
 
-      .btn-wrapper {
-        height: 100%;
-        display: flex;
-        align-items: center;
-      }
-
-      .btn-item {
-        flex: 1;
-        font-size: $font-size-base;
-        height: 72rpx;
-        line-height: 72rpx;
-        text-align: center;
-		border-radius: 50rpx;
+}
+/deep/{
+	.cart-item--price{
 		text{
-        	color: $color-grey0;
+			font-size: $font-size-base;
+			color: $color-yellow4;
 		}
-      }
-
-      // 立即购买按钮
-      .btn-main {
-        background: $color-yellow3;//linear-gradient(to right, #f9211c, #ff6335);
-
-        // 禁用按钮
-        &.disabled {
-          background: rgba($color: $color-yellow3, $alpha: .7);
-        }
-      }
-
-    }
-
+		.ui-money--prefix{
+			font-size: $font-size-sm;
+		}
+	}
+	.goods-price{
+		text{
+			font-size: 40rpx;
+			color: $color-yellow4;
+		}
+		.ui-money--prefix{
+			font-size: $font-size-lg;
+		}
+	}
 }
 </style>

pages/cart/tabBarCart.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-08 18:36:14
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 10:38:37
+ * @LastEditTime: 2022-04-21 15:46:55
  * @Description: file content
 -->
 <template>
@@ -25,7 +25,7 @@ export default {
 
 <style lang="scss" >
 page {
-	background: #f5f5f5;
+	background: $color-grey1;
 	padding-bottom: 240rpx;
   }
 </style>

pages/goods/detail/components/SkuPopup.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-24 11:30:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 10:51:46
+ * @LastEditTime: 2022-04-21 14:42:04
  * @Description: file content
 -->
 <template>
@@ -200,7 +200,9 @@ export default {
 				uni.$u.toast(error.message);
 				return false;
 			}
-			this.$Router.push('/cart');
+			uni.$u.toast('加入购物车成功~');
+			this.close();
+			// this.$Router.push('/cart');
 		},
 		/**
 		 * 立即购买
@@ -225,7 +227,7 @@ export default {
 			}
 		},
 		close(){
-			this.$emit('update:visible', false)
+			this.$emit('update:visible', false);
 		}
 	}
 };

pages/goods/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 17:27:21
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 10:48:00
+ * @LastEditTime: 2022-04-21 14:49:48
  * @Description: file content
 -->
 <template>
@@ -112,7 +112,7 @@ export default {
 			const {query} = this.$Route;
 			const {error, result} = await ApiGetGoodsSkus({productId : query.id});
 			if(error) {
-				uni.$u.totast(error.message);
+				uni.$u.toast(error.message);
 				return false;
 			}
 			this.skuInfoData = result;

pages/index/components/Pick.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 10:29:07
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 11:04:56
+ * @LastEditTime: 2022-04-21 16:23:22
  * @Description: file content
 -->
 <template>
@@ -140,6 +140,7 @@ export default {
 	text{
 		color: $color-yellow4;
 		font-size: $font-size-lg;
+		font-weight: bold;
 	}
 	.ui-money--prefix{
 		font-size: $font-size-sm;

pages/index/components/Seckill.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 10:07:48
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 11:13:03
+ * @LastEditTime: 2022-04-21 16:45:14
  * @Description: file content
 -->
 <template>
@@ -23,12 +23,10 @@
 		</view>
 		<view class="seckill--group">
 			<view v-for="item in data.activityProductListVO" :key="item.activityProductId">
-				<image class="seckill--item-img" :src="item.productMainPicture"></image>
-				<view class="seckill--item-pirce-box">
-					<!-- <text class="seckill--item-pirce-title">秒杀价</text> -->
-					<UiMoney class="seckill--item-pirce" :money="item.activityPrice" prefix></UiMoney>
-					<!-- <text class="seckill--item-pirce">￥{{item.activityPrice}}</text> -->
+				<view  class="seckill--item-img-box">
+					<image class="seckill--item-img" :src="item.productMainPicture"></image>
 				</view>
+				<UiMoney class="seckill--item-pirce" :money="item.activityPrice" prefix></UiMoney>
 				<text class="seckill--item-original-pirce">￥{{item.originalPrice}}</text>
 			</view>
 		</view>
@@ -121,6 +119,7 @@ export default {
 		}
 		&--left{
 			display: flex;
+			align-items: center;
 		}
 		&--time{
 			display: flex;
@@ -134,46 +133,25 @@ export default {
 		}
 		&--time-name{
 			height: 100%;
-			padding: 0 22rpx 0 15rpx;
-			background: #FF512B;
+			padding: 0 32rpx 0 15rpx;
+			background: url('@/static/index/time_bg.png') right top no-repeat #FF512B;
+			background-size: 32rpx;
 			font-size: 22rpx;
 			color: #fff;
 			position: relative;
-			&::after{
-				display: block;
-				content: '';
-				width: 16rpx;
-				height: 36rpx;
-				background: #FF512B;
-				transform: rotate(40deg);
-				position: absolute;
-				right: -10rpx;
-				top: -12rpx;
-			}
+			
 			
 		}
 		&--time-time{
-			margin-right: 15rpx;
+			margin-right: 5rpx;
+			padding-right: 10rpx;
 			font-size: 22rpx;
 			color: #FF512B;
 			position: relative;
-			&::before{
-				display: block;
-				content: '';
-				width: 14rpx;
-				height: 36rpx;
-				background: #FFEDE9;
-				transform: rotate(40deg);
-				position: absolute;
-				left: -52rpx;
-				top: 8rpx;
-				z-index: 0;
-			}
 		}
 		&--time-icon{
 			width: 22rpx;
 			height: 22rpx;
-			padding-left: 20rpx;
 			margin-right: 8rpx;
 		}
 		&--more{
@@ -197,28 +175,20 @@ export default {
 		margin-top: 30rpx;
 	}
 	&--item{
-		&-img{
+		&-img-box{
+
 			width: 200rpx;
 			height: 200rpx;
 			border-radius: 8rpx;
 			background: #F8F8F8;
 		}
-		&-pirce-box{
-			width: 180rpx;
-			height: 44rpx;
-			line-height: 44rpx;
-			background: linear-gradient(90deg, #FFE7DE 0%, #FFFFFF 100%);
-			border-radius: 20rpx;
-			text-align: center;
-			margin: 20rpx 0 10rpx 0;
-		}
-		&-pirce-title{
-			font-size: 22rpx;
-			color: $color-grey5;
+		&-img{
+			width: 100%;
+			height: 100%;
 		}
 		&-pirce{
-			color: #FF512B;
-			font-size: 32rpx;
+			text-align: center;
+			margin-top: 24rpx;
 		}
 		&-original-pirce{
 			display: block;
@@ -226,6 +196,7 @@ export default {
 			color: #999;
 			text-decoration: line-through;
 			text-align: center;
+			margin-top: 6rpx;
 			
 		}
 	}
@@ -238,6 +209,7 @@ export default {
 		text{
 			color: $color-yellow4;
 			font-size: $font-size-lg;
+			font-weight: bold;
 		}
 		.ui-money--prefix{
 			font-size: $font-size-base;

pages/index/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-04-20 19:02:05
+ * @LastEditTime: 2022-04-21 17:00:00
  * @Description: file content
 -->
 <template>
@@ -175,15 +175,11 @@ page{
 			display: block;
 			content: "";
 			width: 34rpx;
-			height: 38rpx;
-			background: url("@/static/index/search.png") no-repeat;
+			height: 42rpx;
+			background: url("@/static/index/search.png") 0 6rpx no-repeat;
 			background-size: 100%;
 		}
 	}
-	&--icon{
-		width: 34rpx;
-		height: 36rpx;
-	}
 }
 
 

pages/order/detail/components/Operation.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 17:46:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 17:36:45
+ * @LastEditTime: 2022-04-21 14:49:57
  * @Description: file content
 -->
 <template>
@@ -82,7 +82,7 @@ export default {
 				orderId : this.$Route.query.id
 			});
 			if(error){
-				uni.$u.totast(error.message);
+				uni.$u.toast(error.message);
 				return false;
 			}
 			// 取消成功，跳到订单关闭页

pages/order/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 16:16:44
+ * @LastEditTime: 2022-04-21 14:49:52
  * @Description: file content
 -->
 <template>
@@ -59,7 +59,7 @@ export default {
 		async getOrderInfo(){
 			const {error, result} = await ApiGetOrderDetail(this.$Route.query.id);
 			if(error){
-				uni.$u.totast(error.message);
+				uni.$u.toast(error.message);
 				return false;
 			}
 			this.orderInfo = {...result};