updata

pages/restaurant/home/shop_home/components/shop-item/shop-item.vue

@@ -76,6 +76,11 @@
 				<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
 				<text class="price">{{item['bt_price']}}</text>
 			</view>
+			<!-- 消费补贴卡 -->
+			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
+				<text class="yang">消费补贴卡:￥</text>
+				<text class="price">{{item['subsidy_card_price']}}</text>
+			</view>
 			<!-- 积分 -->
 			<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom" v-if="!isWx">
 				<text class="yang">预估积分:</text>
@@ -363,7 +368,7 @@
 			padding-left: 22rpx;
 
 			&-bottom {
-				margin-bottom: 15rpx;
+				// margin-bottom: 12rpx;
 			}
 
 			&-title {

pages/restaurant/home/shop_home/shop_home.vue

@@ -107,7 +107,7 @@
 			return {
 				// 肯德基
 				// 顶部通知
-				topNotice: '当前3人正在下单，获取取餐码等待时间为1-2分钟，景区和交通枢纽不支持线上点餐～',
+				topNotice: '当前6人正在下单，获取取餐码等待时间为1-2分钟，景区和交通枢纽不支持线上点餐～',
 				show: false,
 
 				suspend: config['suspend'],

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

@@ -94,6 +94,15 @@
 					<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
 				</view>
 			</view>
+			<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCard()" v-if="!isWx">
+				<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
+					<view>
+						<text lines="1" class="quantity">消费补贴卡：</text>
+						<text lines="1" class="amount">(￥{{ UserCard.amount }} )</text>
+					</view>
+					<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_card? true : false}"></view>
+				</view>
+			</view>
 			<view style="background-color: #fff; padding: 20rpx 40rpx; color: darkred; line-height: 50rpx">
 				<view>温馨提示</view>
 				<view>1、出餐后不支持退款，如需退款，请在出餐前联系客服；</view>
@@ -209,6 +218,7 @@
 	import wx from 'weixin-js-sdk';
 	import state from '@/store/index';
 	import { HTTP_REQUEST_URL } from '@/config/app.js';
+	import { getCardPrice } from '@/request/index/index.js';
 	// 混入
 	import mixin from '@/static/js/mixin/mixin.js';
 	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
@@ -261,7 +271,8 @@
 					// 产品集合
 					products: [],
 					use_coin: 0,
-					use_broker: 0,
+					use_broker: 0,
+					use_card: 0,
 					// products>product_id
 					// products>amount
 					// products>is_deduction
@@ -285,11 +296,13 @@
 				computedTotal: {},
 				use_coin: false,
 				use_broker: false,
+				use_card: false,
 				
 				hasAssigned: false, // 标志变量
 				YingPrice: 0 ,// 应付
 				realPayment: 0, // 实际付款
 				ZeroData: {},
+				UserCard: {}
 			};
 		},
 		onLoad() {
@@ -366,6 +379,7 @@
 				// 计算点餐金额
 				this['FormInfor']['use_coin'] = this.use_coin? 1 : 0;
 				this['FormInfor']['use_broker'] = this.use_broker? 1 : 0;
+				this['FormInfor']['use_card'] = this.use_card? 1 : 0;
 				
 				this['FormInfor']['brand_id'] = this['BrandInfor']['brand_id'];
 				this['FormInfor']['restaurant_id'] = this['GetShopInfor']['restaurant_id'];
@@ -377,6 +391,14 @@
 				
 				// 佣金计算
 				this.computedOrder(this.FormInfor);
+				this.getUserCard();
+			},
+			
+			
+			getUserCard() {
+				getCardPrice().then(res => {
+					this.UserCard = res.data;
+				})
 			},
 			
 			// 是否使用券
@@ -386,6 +408,12 @@
 				this.getCart();
 			},
 			
+			// 是否使用消费补贴卡
+			isCard() {
+				this.use_card = !this.use_card;
+				this.getCart();
+			},
+			
 			isBroker() {
 				this.use_broker = !this.use_broker;
 				this.getCart();

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

@@ -117,6 +117,15 @@
 				<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
 			</view>
 		</view>
+		<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCard()" v-if="!isWx">
+			<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
+				<view>
+					<text lines="1" class="quantity">消费补贴卡：</text>
+					<text lines="1" class="amount">(￥{{ UserCard.amount }} )</text>
+				</view>
+				<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_card? true : false}"></view>
+			</view>
+		</view>
 		
 		<view  lines="1" class="text_23" style="background-color: #fff; padding: 20rpx 40rpx; color: darkred; line-height: 50rpx">
 			<view>温馨提示</view>
@@ -233,7 +242,8 @@
 <script>
 	import wx from 'weixin-js-sdk';
 	import { HTTP_REQUEST_URL } from '@/config/app.js';
-	import state from '@/store/index';
+	import state from '@/store/index';
+	import { getCardPrice } from '@/request/index/index.js';
 	// 混入
 	import mixin from '@/static/js/mixin/mixin.js';
 	import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
@@ -280,7 +290,8 @@
 					// 产品集合
 					products: [],
 					use_coin: 0,
-					use_broker: 0,
+					use_broker: 0,
+					use_card: 0,
 					// products>product_id
 					// products>amount
 					// products>is_deduction
@@ -301,10 +312,12 @@
 				computedTotal: {},
 				use_coin: 0,
 				use_broker: 0,
+				use_card: 0,
 				hasAssigned: false, // 标志变量
 				YingPrice: 0, // 应付
 				realPayment: 0, // 实际付款
-				ZeroData: {}
+				ZeroData: {},
+				UserCard: {}
 			};
 		},
 		onLoad() {
@@ -381,6 +394,7 @@
 				// 计算点餐金额
 				this['FormInfor']['use_coin'] = this.use_coin? 1 : 0;
 				this['FormInfor']['use_broker'] = this.use_broker? 1 : 0;
+				this['FormInfor']['use_card'] = this.use_card? 1 : 0;
 				
 				this['FormInfor']['brand_id'] = this['BrandInfor']['brand_id'];
 				this['FormInfor']['restaurant_id'] = this['GetShopInfor']['restaurant_id'];
@@ -392,6 +406,7 @@
 				
 				// 佣金计算
 				this.computedOrder(this.FormInfor);
+				this.getUserCard();
 			},
 			
 			// 是否使用券
@@ -401,6 +416,18 @@
 				this.getCart()
 			},
 			
+			// 是否使用消费补贴卡
+			isCard() {
+				this.use_card = !this.use_card;
+				this.getCart();
+			},
+			
+			getUserCard() {
+				getCardPrice().then(res => {
+					this.UserCard = res.data;
+				})
+			},
+			
 			isBroker() {
 				this.use_broker = !this.use_broker;
 				this.getCart()

request/index/index.js

@@ -55,4 +55,8 @@ export const caleOrderAPI = parameters => request.Request({ url: "/card.order/ca
 /**
  * @登录
  */
-export const loginAPI = parameters => request.Request({ url: "/card.login/login", parameters});
+export const loginAPI = parameters => request.Request({ url: "/card.login/login", parameters});
+/**
+ * @用户消费补贴卡
+ */
+export const getCardPrice = parameters => request.Request({ url: "/api/s_card/getStatics", parameters});

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.db1a418a.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.05bba68b.js></script><script src=/privilege/static/js/index.720c046e.js></script></body></html>

unpackage/dist/build/web/static/js/pages-diy-shopping_cart-shopping_cart.0f6e727d.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("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

@@ -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("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=[]}}]);