updata

components/b-Shopping-Cart/b-Shopping-Cart.vue

@@ -685,7 +685,7 @@
 		&-right {
 			width: 225rpx;
 			height: 77rpx;
-			background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+			background: #0122A4;
 			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
 			border-radius: 48rpx;
 			text-align: center;

components/b-page-home/b-page-home-rx.vue

@@ -386,7 +386,7 @@
 		padding: 15rpx 32rpx;
 	}
 	.confirmButton{
-		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+		background: #0122A4;
 		border-radius: 43px;
 		color: #ffffff;
 		font-size: 30rpx;

components/b-restaurant-order-status/b-restaurant-order-status.vue

@@ -195,7 +195,7 @@
 				height: 60rpx;
 				color: #ffffff;
 				font-size: 28rpx;
-				background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+				background: #0122A4;
 				border-radius: 30rpx;
 				text-align: center;
 				line-height: 60rpx;

components/b-rx-sku-popup/b-rx-sku-popup.vue

@@ -329,7 +329,7 @@
 			&-right {
 				width: 254rpx;
 				height: 86rpx;
-				background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+				background: #0122A4;
 				box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
 				border-radius: 43rpx;
 				text-align: center;

components/b-shop-item/b-rx-shop-item.vue

@@ -96,7 +96,7 @@
 				}
 				if (this['BrandInfor']['brand_id'] == 13) {
 					return {
-						'background': 'linear-gradient(-77deg, #4A6FE7, #83ACFF)'
+						'background': '#0122A4'
 					};
 				}
 			}

components/b-shop-list-item/b-shop-list-item.vue

@@ -233,7 +233,7 @@
 	// 	.btn {
 	// 		width: 470rpx;
 	// 		height: 86rpx;
-	// 		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+	// 		background: #0122A4;
 	// 		border-radius: 43rpx;
 	// 		font-size: 30rpx;
 	// 		color: #ffffff;

components/新建文件夹/b-Shopping-Cart/b-Shopping-Cart.vue

@@ -607,7 +607,7 @@
 		&-right {
 			width: 225rpx;
 			height: 77rpx;
-			background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+			background: #0122A4;
 			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
 			border-radius: 48rpx;
 			text-align: center;

components/新建文件夹/b-page-home/b-page-home-rx.vue

@@ -386,7 +386,7 @@
 		padding: 15rpx 32rpx;
 	}
 	.confirmButton{
-		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+		background: #0122A4;
 		border-radius: 43px;
 		color: #ffffff;
 		font-size: 30rpx;

components/新建文件夹/b-shop-item/b-rx-shop-item.vue

@@ -96,7 +96,7 @@
 				}
 				if (this['BrandInfor']['brand_id'] == 13) {
 					return {
-						'background': 'linear-gradient(-77deg, #4A6FE7, #83ACFF)'
+						'background': '#0122A4'
 					};
 				}
 			}

components/新建文件夹/b-shop-list-item/b-shop-list-item.vue

@@ -233,7 +233,7 @@
 	// 	.btn {
 	// 		width: 470rpx;
 	// 		height: 86rpx;
-	// 		background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+	// 		background: #0122A4;
 	// 		border-radius: 43rpx;
 	// 		font-size: 30rpx;
 	// 		color: #ffffff;

pages/diy/orders/order-infor/order-infor.vue

@@ -503,7 +503,7 @@
 					height: 60rpx;
 					color: #ffffff;
 					font-size: 28rpx;
-					background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+					background: #0122A4;
 					border-radius: 30rpx;
 					text-align: center;
 					line-height: 60rpx;

pages/restaurant/home/home.vue

@@ -1198,7 +1198,7 @@
 	}
 
 	.confirmButton {
-		// background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+		// background: #0122A4;
 		border-radius: 43px;
 		color: #ffffff;
 		font-size: 30rpx;

pages/restaurant/home/shop_home/components/shop-cart/rx.scss

@@ -48,7 +48,7 @@
 		&-right {
 			width: 225rpx;
 			height: 77rpx;
-			background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+			background: #0122A4;
 			box-shadow: 0 6rpx 8rpx 0 rgba(74, 111, 231, 0.2300);
 			border-radius: 48rpx;
 			text-align: center;

pages/restaurant/order/order-details/details.vue

@@ -702,7 +702,7 @@
 					height: 60rpx;
 					color: #ffffff;
 					font-size: 28rpx;
-					background: linear-gradient(-77deg, #4A6FE7, #83ACFF);
+					background: #0122A4;
 					border-radius: 30rpx;
 					text-align: center;
 					line-height: 60rpx;

pages/restaurant/order/orders-settlement/orders-settlement.vue

@@ -337,7 +337,9 @@
 				}).then(res=>{
 					this.SETPHONE(res['data'].phone)
 					this.getCart();
-				})
+				});
+				
+				this.getUserCard();
 			},
 			
 			getCart() {
@@ -391,7 +393,6 @@
 				
 				// 佣金计算
 				this.computedOrder(this.FormInfor);
-				this.getUserCard();
 			},
 			
 			

pages/restaurant/order/orders-settlement/settlement.vue

@@ -344,7 +344,9 @@
 				}).then(res => {
 					this.SETPHONE(res['data'].phone)
 					this.getCart();
-				})
+				});
+				
+				this.getUserCard();
 			},
 			
 			getCart() {
@@ -406,7 +408,6 @@
 				
 				// 佣金计算
 				this.computedOrder(this.FormInfor);
-				this.getUserCard();
 			},
 			
 			// 是否使用券

static/js/config.js

@@ -620,7 +620,7 @@ const config = {
 			// 自定义普通按钮样式
 			BtnStyle: [{
 				color: '#FFFFFF',
-				background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
+				background: '#0122A4',
 			}],
 			// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
 			OrderStatus: {
@@ -772,7 +772,7 @@ const config = {
 			// 自定义普通按钮样式
 			BtnStyle: [{
 				color: '#FFFFFF',
-				background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
+				background: '#0122A4',
 			}],
 			// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
 			OrderStatus: {

unpackage/dist/build/web/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><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.05bba68b.js></script><script src=/privilege/static/js/index.720c046e.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><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.6763e5fb.js></script><script src=/privilege/static/js/index.36be406f.js></script></body></html>

unpackage/dist/build/web/static/js/config.js

@@ -620,7 +620,7 @@ const config = {
 			// 自定义普通按钮样式
 			BtnStyle: [{
 				color: '#FFFFFF',
-				background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
+				background: '#0122A4',
 			}],
 			// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
 			OrderStatus: {
@@ -772,7 +772,7 @@ const config = {
 			// 自定义普通按钮样式
 			BtnStyle: [{
 				color: '#FFFFFF',
-				background: 'linear-gradient(-77deg, #4A6FE7, #83ACFF)',
+				background: '#0122A4',
 			}],
 			// 订单图标,订单详情中展示的(仅支持星巴克/瑞星类似样式)
 			OrderStatus: {

unpackage/dist/build/web/static/js/pages-diy-shopping_cart-shopping_cart.0f6e727d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-diy-shopping_cart-shopping_cart"],{"3ee3":function(t,i,e){"use strict";e("6a54"),Object.defineProperty(i,"__esModule",{value:!0}),i.default=void 0;var n={data:function(){return{loading:!0,swiperList:["https://cdn.uviewui.com/uview/swiper/swiper1.png","https://cdn.uviewui.com/uview/swiper/swiper2.png","https://cdn.uviewui.com/uview/swiper/swiper3.png"]}},mounted:function(){var t=this;setTimeout((function(){t["loading"]=!1}),2e3)}};i.default=n},7041:function(t,i,e){"use strict";e.r(i);var n=e("bc6d"),u=e("a8bb");for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(i,t,(function(){return u[t]}))}(r);var s=e("828b"),a=Object(s["a"])(u["default"],n["b"],n["c"],!1,null,"32b3d7e1",null,!1,n["a"],void 0);i["default"]=a.exports},a8bb:function(t,i,e){"use strict";e.r(i);var n=e("3ee3"),u=e.n(n);for(var r in n)["default"].indexOf(r)<0&&function(t){e.d(i,t,(function(){return n[t]}))}(r);i["default"]=u.a},bc6d:function(t,i,e){"use strict";e.d(i,"b",(function(){return u})),e.d(i,"c",(function(){return r})),e.d(i,"a",(function(){return n}));var n={uSwiper:e("77c3").default},u=function(){var t=this.$createElement,i=this._self._c||t;return i("v-uni-view",{staticClass:"content"},[i("v-uni-view",{staticClass:"content-Swiper"},[i("u-swiper",{attrs:{list:this.swiperList,height:"585",loading:this.loading}})],1)],1)},r=[]}}]);

unpackage/dist/build/web/static/js/pages-diy-shopping_cart-shopping_cart.522d0057.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-diy-shopping_cart-shopping_cart"],{"3ee3":function(t,i,e){"use strict";e("6a54"),Object.defineProperty(i,"__esModule",{value:!0}),i.default=void 0;var n={data:function(){return{loading:!0,swiperList:["https://cdn.uviewui.com/uview/swiper/swiper1.png","https://cdn.uviewui.com/uview/swiper/swiper2.png","https://cdn.uviewui.com/uview/swiper/swiper3.png"]}},mounted:function(){var t=this;setTimeout((function(){t["loading"]=!1}),2e3)}};i.default=n},7041:function(t,i,e){"use strict";e.r(i);var n=e("bc6d9"),u=e("a8bb");for(var r in u)["default"].indexOf(r)<0&&function(t){e.d(i,t,(function(){return u[t]}))}(r);var s=e("828b"),a=Object(s["a"])(u["default"],n["b"],n["c"],!1,null,"32b3d7e1",null,!1,n["a"],void 0);i["default"]=a.exports},a8bb:function(t,i,e){"use strict";e.r(i);var n=e("3ee3"),u=e.n(n);for(var r in n)["default"].indexOf(r)<0&&function(t){e.d(i,t,(function(){return n[t]}))}(r);i["default"]=u.a},bc6d9:function(t,i,e){"use strict";e.d(i,"b",(function(){return u})),e.d(i,"c",(function(){return r})),e.d(i,"a",(function(){return n}));var n={uSwiper:e("77c3").default},u=function(){var t=this.$createElement,i=this._self._c||t;return i("v-uni-view",{staticClass:"content"},[i("v-uni-view",{staticClass:"content-Swiper"},[i("u-swiper",{attrs:{list:this.swiperList,height:"585",loading:this.loading}})],1)],1)},r=[]}}]);