lilei 4 months ago
parent
commit
f7bc23e638

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 	export default {
 		globalData: {
-			baseUrl: 'http://192.168.2.10:9110/saas/clz/', // 本地
-			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			// baseUrl: 'http://192.168.2.10:9110/saas/clz/', // 本地
+			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		onLaunch: function() {

+ 1 - 1
pages/morePage/morePage.vue

@@ -41,7 +41,7 @@
 			</view>
 			<!-- 余额数据 -->
 			<view class="list-box">
-				<view class="list-body" :style="{paddingTop:item.text?0:'10px'}">
+				<view class="list-body">
 					<uni-grid :column="4" :highlight="true" :show-border="false" :square="false" @change="e=>openDataList(e)">
 						<uni-grid-item v-if="hasBalaceAuth">
 							<view class="grid-item-box" :index="0">

+ 3 - 3
pagesB/accountBalance/accountBalance.vue

@@ -22,7 +22,7 @@
 		</view>
         <view class="recharge-option-content flex_1">
 			<view><text class="gift-text">充值{{ opt.rechargeAmount }}元送{{ opt.giveAmount }}元抵扣</text></view>
-			<view class="gift-remark">{{opt.remarks}}</view>
+			<view class="gift-remark">{{opt.remarks||''}}</view>
 		</view>
 		<view class="recharge-btn flex align_center justify_center" @tap="handleRecharge(opt)">
 			<text>去充值</text>
@@ -131,12 +131,12 @@ export default {
 				}).then(ret=>{
 					if(ret.status == 200){
 						this.showPopu = true
-						this.payData = res.data?res.data.payRequestRest:null
+						this.payData = ret.data?ret.data.payRequestRest:null
 					}
 					setTimeout(()=>{
 						uni.hideLoading()
 					},300)
-					uni.showToast(res.message)
+					uni.showToast(ret.message)
 				})
 		  }else{
 			  setTimeout(()=>{

+ 1 - 1
pagesB/components/payOptions.vue

@@ -16,7 +16,7 @@
 				</view>
 				<view class="flex_auto u-text-right">微信支付</view>
 			</view>
-			<view class="flex align_center justify_between" @tap="changeItem(2)">
+			<view class="flex align_center justify_between" v-if="!hasPay" @tap="changeItem(2)">
 				<view>
 					<uni-icons size="18" :type="defaultValue=='2'?'checkbox-filled':'checkbox'" color="#2196f3"></uni-icons>
 				</view>

+ 1 - 0
pagesB/procureOrder/creatOrder.vue

@@ -108,6 +108,7 @@
 			payOptions
 		},
 		onLoad() {
+			this.payType = this.hasBalancePay ? 0 : (this.hasPay ? 1 : 2)
 			// 计算区域高度
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
 			this.screenWidth = uni.getSystemInfoSync().windowWidth