bug修复
This commit is contained in:
parent
763e68af20
commit
0e407ece6a
@ -2,8 +2,8 @@
|
|||||||
"name": "惠农生活",
|
"name": "惠农生活",
|
||||||
"appid": "__UNI__3A527D1",
|
"appid": "__UNI__3A527D1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"versionName": "2.0.48",
|
"versionName": "2.0.50",
|
||||||
"versionCode": 2048,
|
"versionCode": 2050,
|
||||||
"transformPx": false,
|
"transformPx": false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus": {
|
"app-plus": {
|
||||||
|
@ -863,7 +863,7 @@
|
|||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "商家入驻",
|
"navigationBarTitleText": "商家入驻",
|
||||||
"navigationStyle": "custom",
|
"navigationStyle": "custom",
|
||||||
"enablePullDownRefresh": true
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -39,6 +39,10 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
|
<u-button v-if="showBtn" @click="openApplet" color="#3ABD40" shape="circle" text="立即发布产品"></u-button>
|
||||||
|
|
||||||
|
|
||||||
<view class="application-record" v-if="listData.length">
|
<view class="application-record" v-if="listData.length">
|
||||||
<!-- <view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
|
<!-- <view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
|
||||||
<view class="card-top">
|
<view class="card-top">
|
||||||
@ -78,17 +82,22 @@
|
|||||||
// | Author: CRMEB Team <admin@crmeb.com>
|
// | Author: CRMEB Team <admin@crmeb.com>
|
||||||
// +----------------------------------------------------------------------
|
// +----------------------------------------------------------------------
|
||||||
import {
|
import {
|
||||||
getApplicationRecordList
|
getApplicationRecordList,
|
||||||
|
getUnimpInfo
|
||||||
} from '@/api/store.js'
|
} from '@/api/store.js'
|
||||||
import {
|
import {
|
||||||
HTTP_REQUEST_URL
|
HTTP_REQUEST_URL
|
||||||
} from '@/config/app';
|
} from '@/config/app';
|
||||||
|
|
||||||
|
import uniMP from '@/utils/uniMP.js';
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
domain: HTTP_REQUEST_URL,
|
domain: HTTP_REQUEST_URL,
|
||||||
loading: false,
|
loading: false,
|
||||||
|
showBtn: false,
|
||||||
listData: [],
|
listData: [],
|
||||||
|
uniMpInfo: {},
|
||||||
pageData: {
|
pageData: {
|
||||||
page: 1,
|
page: 1,
|
||||||
limit: 10,
|
limit: 10,
|
||||||
@ -112,6 +121,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
openApplet() {
|
||||||
|
this.uniMpInfo.showToast = true
|
||||||
|
uniMP.loadAppletMP(this.uniMpInfo)
|
||||||
|
},
|
||||||
getListData() {
|
getListData() {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
@ -120,6 +133,12 @@
|
|||||||
getApplicationRecordList(this.pageData).then(res => {
|
getApplicationRecordList(this.pageData).then(res => {
|
||||||
this.count = res.data.count
|
this.count = res.data.count
|
||||||
this.listData = this.listData.concat(res.data.list)
|
this.listData = this.listData.concat(res.data.list)
|
||||||
|
this.showBtn = (this.listData[this.listData.length - 1].status == 1)
|
||||||
|
if (this.showBtn) {
|
||||||
|
getUnimpInfo().then(res => {
|
||||||
|
this.uniMpInfo = res.data
|
||||||
|
})
|
||||||
|
}
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
|
@ -168,7 +168,8 @@
|
|||||||
<u-line style="margin: 28rpx 0;"></u-line>
|
<u-line style="margin: 28rpx 0;"></u-line>
|
||||||
<view class="card-cont-li">
|
<view class="card-cont-li">
|
||||||
<view class="ellipsis" style="display: flex;align-items: center;">
|
<view class="ellipsis" style="display: flex;align-items: center;">
|
||||||
社会信用代码 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
|
社会信用代码 <u--input @blur='creditCodeInput'
|
||||||
|
style="margin-left: 40rpx;width: 500rpx;" border="none"
|
||||||
v-model="formData.social_credit_code">
|
v-model="formData.social_credit_code">
|
||||||
</u--input>
|
</u--input>
|
||||||
</view>
|
</view>
|
||||||
@ -393,6 +394,9 @@
|
|||||||
},
|
},
|
||||||
mapGetters(['isLogin', 'viewColor', 'keyColor'])),
|
mapGetters(['isLogin', 'viewColor', 'keyColor'])),
|
||||||
methods: {
|
methods: {
|
||||||
|
creditCodeInput() {
|
||||||
|
this.formData.social_credit_code = this.formData.social_credit_code.replace(/[\u4E00-\u9FA5]/g, '');
|
||||||
|
},
|
||||||
countDown() {
|
countDown() {
|
||||||
let {
|
let {
|
||||||
num
|
num
|
||||||
@ -415,8 +419,8 @@
|
|||||||
uni.navigateBack()
|
uni.navigateBack()
|
||||||
},
|
},
|
||||||
openApplet() {
|
openApplet() {
|
||||||
|
this.uniMpInfo.showToast = true
|
||||||
uniMP.loadAppletMP(this.uniMpInfo)
|
uniMP.loadAppletMP(this.uniMpInfo)
|
||||||
|
|
||||||
},
|
},
|
||||||
splitAddress(str) {
|
splitAddress(str) {
|
||||||
if (!str.includes('省')) str = "四川省" + str;
|
if (!str.includes('省')) str = "四川省" + str;
|
||||||
@ -482,8 +486,8 @@
|
|||||||
if (res.status == 200) {
|
if (res.status == 200) {
|
||||||
that.formData.address = res.data.address;
|
that.formData.address = res.data.address;
|
||||||
that.formData.name = res.data.legal_person;
|
that.formData.name = res.data.legal_person;
|
||||||
// that.formData.social_credit_code = res.data.register_number;
|
that.formData.social_credit_code = res.data.register_number;
|
||||||
that.formData.social_credit_code = this.generateRandomNumbers(1, 10000, 99999)[0];
|
// that.formData.social_credit_code = this.generateRandomNumbers(1, 10000, 99999)[0];
|
||||||
that.formData.company_name = res.data.name;
|
that.formData.company_name = res.data.name;
|
||||||
} else {
|
} else {
|
||||||
that.$util.Tips({
|
that.$util.Tips({
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
class="target-icon"></image>
|
class="target-icon"></image>
|
||||||
<text class="target-text">商家入驻</text>
|
<text class="target-text">商家入驻</text>
|
||||||
</view>
|
</view>
|
||||||
<view :style="{left:left-20,top:top-70}" class="trans1">
|
<view :style="{left:left-20+'px',top:top-70+'px'}" class="trans1">
|
||||||
<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
|
<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="tips-box" :style="{left:left-13.5,top:top-154}">
|
<view class="tips-box" :style="{left:left-13.5,top:top-154}">
|
||||||
@ -32,8 +32,8 @@
|
|||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
screenHeight: 800,
|
screenHeight: 0,
|
||||||
screenWidth: 375,
|
screenWidth: 0,
|
||||||
isAct: false,
|
isAct: false,
|
||||||
left: -100,
|
left: -100,
|
||||||
top: -100,
|
top: -100,
|
||||||
@ -48,13 +48,17 @@
|
|||||||
onLoad() {
|
onLoad() {
|
||||||
let that = this
|
let that = this
|
||||||
uni.$on('openUserSubnvue', (data) => {
|
uni.$on('openUserSubnvue', (data) => {
|
||||||
that.left = JSON.parse(data).left
|
console.log('data')
|
||||||
that.top = JSON.parse(data).top
|
console.log(data)
|
||||||
|
this.left = JSON.parse(data).left
|
||||||
|
this.top = JSON.parse(data).top
|
||||||
|
console.log(this.left, this.top)
|
||||||
})
|
})
|
||||||
const res = uni.getSystemInfo({
|
const res = uni.getSystemInfo({
|
||||||
success: (res => {
|
success: (res => {
|
||||||
this.screenHeight = res.screenHeight
|
this.screenHeight = res.screenHeight
|
||||||
this.screenWidth = res.screenWidth
|
this.screenWidth = res.screenWidth
|
||||||
|
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
@ -523,6 +523,9 @@
|
|||||||
} else {
|
} else {
|
||||||
toLogin()
|
toLogin()
|
||||||
}
|
}
|
||||||
|
if (options.sale_type) {
|
||||||
|
this.sale_type = options.sale_type
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
onReady: function() {
|
onReady: function() {
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
import {
|
||||||
|
Toast
|
||||||
|
} from "../libs/uniApi";
|
||||||
import {
|
import {
|
||||||
getGXconfig,
|
getGXconfig,
|
||||||
miniapp
|
miniapp
|
||||||
@ -202,6 +205,8 @@ const loadMPurl = async (e) => {
|
|||||||
|
|
||||||
// 商城配置的小程序
|
// 商城配置的小程序
|
||||||
const loadAppletMP = async (data) => {
|
const loadAppletMP = async (data) => {
|
||||||
|
// console.log(data)
|
||||||
|
// return
|
||||||
appid = data.app_id;
|
appid = data.app_id;
|
||||||
// return ;
|
// return ;
|
||||||
uni.$emit('showLoading', true, '初始化中');
|
uni.$emit('showLoading', true, '初始化中');
|
||||||
@ -212,6 +217,12 @@ const loadAppletMP = async (data) => {
|
|||||||
} else {
|
} else {
|
||||||
flag = true
|
flag = true
|
||||||
}
|
}
|
||||||
|
if (data.showToast) {
|
||||||
|
uni.showLoading({
|
||||||
|
title: '正在加载中...'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (0 != ret.code || compareVersions(data.version, ret.versionInfo.name) == 1 || flag ==
|
if (0 != ret.code || compareVersions(data.version, ret.versionInfo.name) == 1 || flag ==
|
||||||
true) {
|
true) {
|
||||||
let count = 0;
|
let count = 0;
|
||||||
@ -220,6 +231,8 @@ const loadAppletMP = async (data) => {
|
|||||||
`初始化中... ${count}%`)
|
`初始化中... ${count}%`)
|
||||||
else uni.$emit('showLoading', true, `初始化中... 99%`)
|
else uni.$emit('showLoading', true, `初始化中... 99%`)
|
||||||
}, 200)
|
}, 200)
|
||||||
|
|
||||||
|
|
||||||
let downloadTask = uni.downloadFile({
|
let downloadTask = uni.downloadFile({
|
||||||
url: data.url,
|
url: data.url,
|
||||||
// url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt",
|
// url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/3ffde202405031254278460.wgt",
|
||||||
@ -326,6 +339,7 @@ const doInstallMP = (data) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const open = (id = null) => {
|
const open = (id = null) => {
|
||||||
|
uni.hideLoading()
|
||||||
uni.$emit('showLoading', false);
|
uni.$emit('showLoading', false);
|
||||||
let token = uni.getStorageSync('LOGIN_STATUS_TOKEN');
|
let token = uni.getStorageSync('LOGIN_STATUS_TOKEN');
|
||||||
if (!token) return uni.showToast({
|
if (!token) return uni.showToast({
|
||||||
|
Loading…
x
Reference in New Issue
Block a user