This commit is contained in:
parent
8c33ae1516
commit
83a8306ea4
2
App.vue
2
App.vue
|
@ -4,7 +4,7 @@
|
||||||
console.log('App Launch');
|
console.log('App Launch');
|
||||||
},
|
},
|
||||||
onShow: function() {
|
onShow: function() {
|
||||||
console.log('App Show')
|
console.log('App Show');
|
||||||
},
|
},
|
||||||
onHide: function() {
|
onHide: function() {
|
||||||
console.log('App Hide');
|
console.log('App Hide');
|
||||||
|
|
|
@ -232,11 +232,14 @@
|
||||||
for (let key in data) {
|
for (let key in data) {
|
||||||
STORE_INFO[key] = data[key]
|
STORE_INFO[key] = data[key]
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
getStoreInfo().then(res => {
|
|
||||||
uni.setStorageSync("STORE_INFO", JSON.stringify(res.data))
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
getStoreInfo().then(res => {
|
||||||
|
uni.setStorageSync("STORE_INFO", JSON.stringify(res.data));
|
||||||
|
let data = res.data;
|
||||||
|
for (let key in data) {
|
||||||
|
STORE_INFO[key] = data[key]
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
getStoreInfoFn()
|
getStoreInfoFn()
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill"
|
<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill"
|
||||||
color="#fff" size="28"></up-icon>微信快捷登录</up-button>
|
color="#fff" size="28"></up-icon>微信快捷登录</up-button>
|
||||||
</view>
|
</view>
|
||||||
<view class="btn">
|
<!-- <view class="btn">
|
||||||
<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
|
<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
|
||||||
name="weixin-fill" color="#fff" size="28"></up-icon>账号登录</up-button>
|
name="weixin-fill" color="#fff" size="28"></up-icon>账号登录</up-button>
|
||||||
</view>
|
</view> -->
|
||||||
<!-- <view class="btn">
|
<!-- <view class="btn">
|
||||||
<up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
|
<up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
|
||||||
size="28"></up-icon>公众号授权</up-button>
|
size="28"></up-icon>公众号授权</up-button>
|
||||||
|
|
|
@ -107,7 +107,7 @@
|
||||||
|
|
||||||
<view class="card">
|
<view class="card">
|
||||||
<up-cell-group>
|
<up-cell-group>
|
||||||
<up-cell title="我的余额" :isLink="true" url="/pageQuota/Balance/index"></up-cell>
|
<!-- <up-cell title="我的余额" :isLink="true" url="/pageQuota/Balance/index"></up-cell> -->
|
||||||
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
|
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
|
||||||
</up-cell-group>
|
</up-cell-group>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;'
|
style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;'
|
||||||
@click="callPhone(shopInfo.phone)">
|
@click="callPhone(shopInfo.phone)">
|
||||||
<view class="top" style="align-items: flex-start;">
|
<view class="top" style="align-items: flex-start;">
|
||||||
<view style="color: #333;display: flex;align-items: center;">
|
<view style="color: #333;display: flex;align-items: center;flex-shrink: 0;">
|
||||||
<up-icon name="map"></up-icon>
|
<up-icon name="map"></up-icon>
|
||||||
<text style="margin: 0 10rpx;">自提点</text>
|
<text style="margin: 0 10rpx;">自提点</text>
|
||||||
</view>
|
</view>
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view @click.stop="navgo('/multipleShop/index/index')"
|
<view @click.stop="navgo('/multipleShop/index/index')"
|
||||||
style="padding: 20rpx;background-color:#20B128;color: white;border-radius: 40rpx;">
|
style="padding: 20rpx;background-color:#20B128;color: white;border-radius: 40rpx;flex-shrink: 0;">
|
||||||
所有提货点
|
所有提货点
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -91,12 +91,13 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- <view class="row"
|
<view class="row"
|
||||||
v-if="userInfo.user_ship == 4 || userInfo.user_ship == 5 || userInfo.user_ship == 6 || userInfo.user_ship == 1"> -->
|
v-if="userInfo.user_ship == 4 || userInfo.user_ship == 5 || userInfo.user_ship == 6 || userInfo.user_ship == 1">
|
||||||
<view class="row">
|
<!-- <view class="row"> -->
|
||||||
<view class="icon-text">
|
<view class="icon-text">
|
||||||
<image src="@/static/icon/YEZF.png" style="width:40rpx;height: 40rpx;" />
|
<image src="@/static/icon/YEZF.png" style="width:40rpx;height: 40rpx;" />
|
||||||
<text style="margin-left: 20rpx;font-size: 26rpx;">余额支付</text>
|
<text style="margin-left: 20rpx;font-size: 26rpx;">余额支付</text>
|
||||||
|
<text style="margin-left: 20rpx;font-size: 22rpx;color: #FFB76D;">( 可用¥{{userInfo.now_money}} )</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="icon" @click="onChoosePaytype(3)">
|
<view class="icon" @click="onChoosePaytype(3)">
|
||||||
<image v-if="pay_type == 3" src="@/static/icon/check.png" />
|
<image v-if="pay_type == 3" src="@/static/icon/check.png" />
|
||||||
|
@ -109,6 +110,7 @@
|
||||||
<view class="icon-text">
|
<view class="icon-text">
|
||||||
<image src="@/static/icon/cgkzf.png" style="width:40rpx;height: 40rpx;" />
|
<image src="@/static/icon/cgkzf.png" style="width:40rpx;height: 40rpx;" />
|
||||||
<text style="margin-left: 20rpx;font-size: 26rpx;">采购款支付</text>
|
<text style="margin-left: 20rpx;font-size: 26rpx;">采购款支付</text>
|
||||||
|
<text style="margin-left: 20rpx;font-size: 22rpx;color: #1296DB;">( 可用¥{{userInfo.purchase_funds}} )</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="icon" @click="onChoosePaytype(18)">
|
<view class="icon" @click="onChoosePaytype(18)">
|
||||||
<image v-if="pay_type == 18" src="@/static/icon/check.png" />
|
<image v-if="pay_type == 18" src="@/static/icon/check.png" />
|
||||||
|
@ -353,7 +355,7 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const pay_type = ref('');
|
const pay_type = ref('7');
|
||||||
|
|
||||||
const createOrder = () => {
|
const createOrder = () => {
|
||||||
if (!pay_type.value) return uni.$u.toast('请选择支付方式');
|
if (!pay_type.value) return uni.$u.toast('请选择支付方式');
|
||||||
|
|
Loading…
Reference in New Issue