add
This commit is contained in:
parent
be3213996f
commit
2a14ce699b
|
@ -7,3 +7,9 @@ export const goodListApi = (data) => {
|
||||||
export const goodClassListApi = (data) => {
|
export const goodClassListApi = (data) => {
|
||||||
return request.get('/goods/goodsclass/lists', data);
|
return request.get('/goods/goodsclass/lists', data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
export const getPush = (data) => {
|
||||||
|
return request.get('/push', data);
|
||||||
|
}
|
|
@ -2,8 +2,8 @@ let BASE_URL
|
||||||
let WSS_URL
|
let WSS_URL
|
||||||
import store from "@/store/user.js"
|
import store from "@/store/user.js"
|
||||||
// 环境
|
// 环境
|
||||||
// let env = "dev"
|
let env = "dev"
|
||||||
let env = "prod"
|
// let env = "prod"
|
||||||
// let env = "release";
|
// let env = "release";
|
||||||
// let env = "local";
|
// let env = "local";
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,6 @@
|
||||||
<up-form-item label="手机号" borderBottom>
|
<up-form-item label="手机号" borderBottom>
|
||||||
<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
|
<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
|
||||||
</up-form-item>
|
</up-form-item>
|
||||||
<!-- <up-form-item label="角色" borderBottom>
|
|
||||||
<uni-data-select v-model="Role" :localdata="range" :clear='false'></uni-data-select>
|
|
||||||
</up-form-item> -->
|
|
||||||
</up-form>
|
</up-form>
|
||||||
</view>
|
</view>
|
||||||
</up-modal>
|
</up-modal>
|
||||||
|
@ -347,7 +344,8 @@
|
||||||
// label_name: "",
|
// label_name: "",
|
||||||
// label_id: "4",
|
// label_id: "4",
|
||||||
// user_ship: '1',
|
// user_ship: '1',
|
||||||
// code: ''
|
// price: 0.02,
|
||||||
|
// code: '12'
|
||||||
})
|
})
|
||||||
|
|
||||||
const tofixedPrice = () => {
|
const tofixedPrice = () => {
|
||||||
|
@ -481,7 +479,10 @@
|
||||||
const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
|
const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
|
||||||
user_channel.on('message', function(data) {
|
user_channel.on('message', function(data) {
|
||||||
try {
|
try {
|
||||||
|
uni.hideLoading({});
|
||||||
|
console.log(timerInvol)
|
||||||
clearTimeout(timerInvol);
|
clearTimeout(timerInvol);
|
||||||
|
console.log("清除" + timerInvol)
|
||||||
paySuccessToTabs2()
|
paySuccessToTabs2()
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
});
|
});
|
||||||
|
@ -501,7 +502,16 @@
|
||||||
if (Role.value == 1) {
|
if (Role.value == 1) {
|
||||||
// formData.recharge_type = 'INDUSTRYMEMBERS'
|
// formData.recharge_type = 'INDUSTRYMEMBERS'
|
||||||
// formData.user_ship = 1
|
// formData.user_ship = 1
|
||||||
// vipRechargeApi(formData).then(res => {})
|
// vipRechargeApi(formData).then(res => {
|
||||||
|
// uni.showLoading({
|
||||||
|
// title: '支付中...'
|
||||||
|
// });
|
||||||
|
// timerInvol = setTimeout(() => {
|
||||||
|
// uni.hideLoading();
|
||||||
|
// uni.$u.toast('支付超时');
|
||||||
|
// console.log("支付超时")
|
||||||
|
// }, 10000)
|
||||||
|
// })
|
||||||
// return
|
// return
|
||||||
uni.scanCode({
|
uni.scanCode({
|
||||||
success: function(res) {
|
success: function(res) {
|
||||||
|
@ -538,7 +548,6 @@
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
timerInvol = setTimeout(() => {
|
timerInvol = setTimeout(() => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
if (currentTab.value == 2) return;
|
|
||||||
uni.$u.toast('支付超时');
|
uni.$u.toast('支付超时');
|
||||||
}, 30000)
|
}, 30000)
|
||||||
})
|
})
|
||||||
|
|
|
@ -24,9 +24,12 @@
|
||||||
<view class="store-info">
|
<view class="store-info">
|
||||||
<view style="display: flex;font-size: 30rpx;font-weight: bold;">
|
<view style="display: flex;font-size: 30rpx;font-weight: bold;">
|
||||||
<text v-if="userStore.userInfo.user_ship == 1 || shareInfo.store_id"
|
<text v-if="userStore.userInfo.user_ship == 1 || shareInfo.store_id"
|
||||||
style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{
|
style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
|
||||||
(shareInfo.real_name || (
|
<text v-if="userStore.userInfo.user_ship == 1">
|
||||||
userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }}</text>
|
{{ (userStore.userInfo.real_name || userStore.userInfo.nickname) + '的供销个人门店' }}</text>
|
||||||
|
<text v-else>
|
||||||
|
{{(shareInfo.real_name || (userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }}</text>
|
||||||
|
</text>
|
||||||
<text v-else
|
<text v-else
|
||||||
style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{
|
style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{
|
||||||
STORE_INFO.store_name }}</text>
|
STORE_INFO.store_name }}</text>
|
||||||
|
|
|
@ -13,13 +13,13 @@
|
||||||
<block v-if="showWeixin">
|
<block v-if="showWeixin">
|
||||||
<up-transition :show="showWeixin">
|
<up-transition :show="showWeixin">
|
||||||
<view class="btn">
|
<view class="btn">
|
||||||
<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill"
|
<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
|
||||||
color="#fff" size="28"></up-icon>微信快捷登录</up-button>
|
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="account-fill" color="#fff" size="28"></up-icon>手机号快捷登录</up-button>
|
name="account-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>
|
||||||
|
|
Loading…
Reference in New Issue