12121

BagAuth/pages/login/components/loginBottom.vue

@@ -8,7 +8,7 @@
 			<view class="padding-xs">
 				<checkbox @tap="onChange" class='round red chagesize' :class="checked?'checked':''" :checked="checked?true:false"
 				 value="C"></checkbox> 我已阅读并同意
-				<text @tap="toAgree('baichuanUserAgree')" class="oil-main-color">《用户协议》</text>和<text @tap="toAgree('baichuanPrivacyAgreement')" class="oil-main-color">《隐私政策》</text>
+				<text @tap="toAgree('zhongpinUserAgree')" class="oil-main-color">《用户协议》</text>和<text @tap="toAgree('zhongpinPrivacyAgreement')" class="oil-main-color">《隐私政策》</text>
 			</view>
 		</view>
 	</view>

BagStation/pages/components/price-tab.vue

@@ -89,6 +89,10 @@
 				}
 			}
 		},
+		created() {
+			
+		},
+		
 		methods: {
 			tabSelect(e) {
 				this.TabCur = e.currentTarget.dataset.id;

BagStation/pages/makeOrder/orderPaying.vue

@@ -316,7 +316,7 @@
 					orderId: this.order.orderSerialNumber,
 					payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID，小程序
 					userIp:  (this.userIp?this.userIp:"36.57.160.59") ,
-					merchantNo:'10088997357'
+					merchantNo:'10089027856'
 				}
 
 				oilPayApi.aggregatePay(payData).then(res => {
@@ -393,7 +393,7 @@
 					"payChannel": "BALANCE_PAYMENT", //类型：String  必有字段  备注：支付渠道（BALANCE_PAYMENT：余额支付）
 					"orderMethod": "CUSTOMER_ACTIVE", //类型：String  必有字段  备注：订单产生方式（CUSTOMER_ACTIVE：客户扫码支付：客户扫描油站二维码完成支付）
 					"createSource": "XOIL_DRIVER_WECHAT_APPLET",
-					merchantNo: '10088997357',
+					merchantNo: '10089027856',
 				}
 				oilOrderApi.payOrder(payData).then(res => {
 					if (res.code == 20000) {

components/site-item/site-item.vue

@@ -24,7 +24,7 @@
 						{{item.oilProductCode}}
 					</view>
 					<view class="oil-main-color text-xl text-bold padding-right-xs" style="padding-right: 0;">
-						￥{{item.personalPrice|moneyFormat}}
+						￥{{item.personalPriceZp|moneyFormat}}
 					</view>
 				</view>
 				<view v-if="!listHeight" class="text-bold  yellow-oil text-xl padding-right-xs">
@@ -82,6 +82,9 @@
 				audioUrl:''
 			}
 		}, 
+		created() {
+			console.log(this.siteItem,'-----------------')
+		},
 		methods: {
 
 		},

pages/tabbar/home/home.vue

@@ -106,30 +106,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- 宫格菜单开始 -->
-		<!-- <view class="bg-white padding pagestartthree">
-			<view class="grid col-5 text-center ">
-				<view class="text-xxl " v-for="(item,index) in cuIconList" @tap="shadoumeiyou(index)" :key="index"
-					:class="index<5?'margin-bottom':''">
-					! <view :class="['cuIcon-'+item.icon,'text-' +item.color]">
-					</view> 
-					<view class="text-center">
-						<view class="my-icon-sm">
-							<image :src="imgURL +item.iconUrl" mode="widthFix"></image>
-						</view>
-						<view class="text-sm">
-							<text class="text-sm color-333">
-								{{item.name}}
-							</text>
-						</view>
-
-					</view>
-
-
-				</view>
-
-			</view>
-		</view> -->
 		<!-- 广告图片开始 -->
 		<view class="my-bg padding">
 			<view class="" >