liujd 6 лет назад
Родитель
Сommit
d7902b9833

+ 3 - 3
mobile-code/src/constant/index.js

@@ -31,7 +31,7 @@ if (ProjectName == 'mobile') {
 	envVal.hostUrl = process.env.NODE_ENV == 'development' ? extConfig.mHost : extConfig.mHost
 	// #endif
 
-	uni.setStorageSync('source', 'mobile')
+	// uni.setStorageSync('source', 'mobile')
 } else if (ProjectName == 'business') {
 	// #ifdef H5
 	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://b.huaml.com' : `${window.location.protocol}//${window.location.host}`
@@ -42,7 +42,7 @@ if (ProjectName == 'mobile') {
 	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.b.huaml.com` : `https://api.b.huaml.com`
 	// #endif
 
-	uni.setStorageSync('source', 'business')
+	// uni.setStorageSync('source', 'business')
 } else {
 	// #ifdef H5
 	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://w.huaml.com' : `${window.location.protocol}//${window.location.host}`
@@ -53,7 +53,7 @@ if (ProjectName == 'mobile') {
 	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.w.huaml.com` : `https://api.w.huaml.com`
 	// #endif
 
-	uni.setStorageSync('source', 'www')
+	// uni.setStorageSync('source', 'www')
 }
 
 function getFirstHost() {

+ 18 - 16
mobile-code/src/pages/pay/index.vue

@@ -8,24 +8,26 @@
 		</block>
 		<!-- 直接付款 -->
 		<block v-if="tabIndex == 0">
-			<div class="logo-wrap">
-				<div class="logo-img">
-					<img :src="`${constant.imgUrl}/retail/user/attr-default.png`" alt mode="widthFix" />
-				</div>
-				<div class="app-size-30">{{ shopUser.userName }}</div>
-			</div>
-			<div class="pay-input-wrap">
-				<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
-				<div class="balance">
-					<span>账户余额 ¥</span>
-					<span class="app-size-30">{{ shopUser.userAsset.balance }}</span>
+			<block v-if="!$util.isEmpty(shopUser)">
+				<div class="logo-wrap">
+					<div class="logo-img">
+						<img :src="`${constant.imgUrl}/retail/user/attr-default.png`" alt mode="widthFix" />
+					</div>
+					<div class="app-size-30">{{ shopUser.userName }}</div>
 				</div>
-				<!-- 按钮 -->
-				<div class="btn-wrap">
-					<button class="button-com red" @click="balancePayFn">余额支付</button>
-					<button class="button-com green" @click="wexinPayFn">微信支付</button>
+				<div class="pay-input-wrap">
+					<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
+					<div class="balance">
+						<span>账户余额 ¥</span>
+						<span class="app-size-30">{{ shopUser.userAsset.balance }}</span>
+					</div>
+					<!-- 按钮 -->
+					<div class="btn-wrap">
+						<button class="button-com red" @click="balancePayFn">余额支付</button>
+						<button class="button-com green" @click="wexinPayFn">微信支付</button>
+					</div>
 				</div>
-			</div>
+			</block>
 		</block>
 		<!-- 我要配送 -->
 		<block v-else>

+ 4 - 4
mobile-code/src/plugins/luch-request_0.0.7/request.js

@@ -86,10 +86,10 @@ class Request {
 		if (account) {
 			config.header['account'] = account
 		}
-		const source = uni.getStorageSync('source') || null
-		if (source) {
-			config.header['source'] = source
-		}
+		// const source = uni.getStorageSync('source') || null
+		// if (source) {
+		// 	config.header['source'] = source
+		// }
 		if (constant.source == 'mobile') {
 			const shopId = uni.getStorageSync('shopId') || 0
 			if (shopId) {