This commit is contained in:
parent
e8d2053c69
commit
64b7a52d22
|
|
@ -9,8 +9,8 @@ let httpApiThree
|
|||
let wsApi
|
||||
|
||||
// 在打包之前请检查当前环境是否正确
|
||||
const env = 'dev'; // 开发
|
||||
// const env = 'prod'; // 生产
|
||||
// const env = 'dev'; // 开发
|
||||
const env = 'prod'; // 生产
|
||||
// const env = 'prew'; // 预上线
|
||||
|
||||
switch (env) {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
"name": "惠农商户平台",
|
||||
"appid": "__UNI__1EE148C",
|
||||
"description": "",
|
||||
"versionName" : "1.4.6",
|
||||
"versionCode" : 1460,
|
||||
"versionName": "1.4.9",
|
||||
"versionCode": 1490,
|
||||
"transformPx": false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus": {
|
||||
|
|
@ -215,4 +215,3 @@
|
|||
}
|
||||
//拨打电话权限关闭
|
||||
/* ios打包配置 */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
<template>
|
||||
<view class="basic_set">
|
||||
<!-- 老板说这里不要 -->
|
||||
<view class="basice_item">
|
||||
<view class="headline">
|
||||
<view class="text flex_a_c">店铺基本配置</view>
|
||||
</view>
|
||||
<view class="store_bg">
|
||||
<view class="store_bg" v-if="false">
|
||||
<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>店铺背景图</view>
|
||||
<block v-if="images[0].img">
|
||||
<!-- <u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
|
||||
@click="delImg(0)" mode="aspectFit"></u--image> -->
|
||||
<u--image :showLoading="true" :src="images[0].img" width="680rpx" height="210.53rpx" radius="4px"
|
||||
@click="delImg(0)"></u--image>
|
||||
</block>
|
||||
|
|
@ -17,6 +16,7 @@
|
|||
建议尺寸：710*220px
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="store_avatar flex_a_c_j_sb">
|
||||
<view class="avatar_box">
|
||||
<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>店铺头像</view>
|
||||
|
|
@ -49,10 +49,6 @@
|
|||
<u--image :showLoading="true" @click="priviewImg(imagesArr, index)" :src="imgArr"
|
||||
width="210.53rpx" height="210.53rpx" radius="4px"></u--image>
|
||||
</view>
|
||||
<!-- <view class="avatar_img other-item" @click="seleckImageArr()" :style="{marginRight: (imagesArr.length+1)%3==0?'0rpx':'20rpx'}">
|
||||
<view class="iconfont icon-tupian1"></view>
|
||||
建议尺寸：120*120px
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -69,7 +65,8 @@
|
|||
</view>
|
||||
</block>
|
||||
</view>
|
||||
<view class="street_bg" style="margin-bottom:20rpx;">
|
||||
|
||||
<view class="street_bg" style="margin-bottom:20rpx;" v-if="false">
|
||||
<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view>
|
||||
<block v-if="images[2].img">
|
||||
<u--image :showLoading="true" :src="images[2].img" width="680rpx" height="210.53rpx" radius="4px"
|
||||
|
|
@ -91,8 +88,7 @@
|
|||
<text class="sub_title">配送方式：</text>
|
||||
<view class="flex">
|
||||
<checkbox-group name="" @change="checkboxChange">
|
||||
<checkbox :checked="isZiti" :value="check.ziti" /><text
|
||||
class="text ziti">到店自提</text>
|
||||
<checkbox :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提</text>
|
||||
<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text class="text">商家配送</text>
|
||||
</checkbox-group>
|
||||
</view>
|
||||
|
|
@ -183,8 +179,6 @@
|
|||
</view>
|
||||
<text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text>
|
||||
</view> -->
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<button class="submit_btn l_center" @click="postMerchantUpdata">提交</button>
|
||||
|
|
@ -250,7 +244,7 @@
|
|||
},
|
||||
isZiti: false,
|
||||
isKuaidi: false,
|
||||
delivery_way: [1],
|
||||
delivery_way: [1, 2],
|
||||
takeName: '',
|
||||
takePhone: '',
|
||||
servicePhone: '',
|
||||
|
|
@ -264,34 +258,34 @@
|
|||
dateWeek: [{
|
||||
name: '星期一',
|
||||
id: 1,
|
||||
isCheck: false
|
||||
isCheck: true
|
||||
}, {
|
||||
name: '星期二',
|
||||
id: 2,
|
||||
isCheck: false
|
||||
isCheck: true
|
||||
}, {
|
||||
name: '星期三',
|
||||
id: 3,
|
||||
isCheck: false
|
||||
isCheck: true
|
||||
}, {
|
||||
name: '星期四',
|
||||
id: 4,
|
||||
isCheck: false
|
||||
isCheck: true
|
||||
}, {
|
||||
name: '星期五',
|
||||
id: 5,
|
||||
isCheck: false
|
||||
isCheck: true
|
||||
}, {
|
||||
name: '星期六',
|
||||
id: 6,
|
||||
isCheck: false
|
||||
isCheck: true
|
||||
}, {
|
||||
name: '星期日',
|
||||
id: 7,
|
||||
isCheck: false
|
||||
isCheck: true
|
||||
}],
|
||||
selarr: [],
|
||||
mer_take_time: [],
|
||||
selarr: [1, 2, 3, 4, 5, 6, 7],
|
||||
mer_take_time: ['08:00', '18:00'],
|
||||
beginTimeShow: false,
|
||||
overTimeShow: false,
|
||||
mer_address: '',
|
||||
|
|
@ -307,49 +301,59 @@
|
|||
},
|
||||
onLoad(e) {
|
||||
this.id = e.mer_id
|
||||
this.getMerchantInfo(e.mer_id)
|
||||
|
||||
this.isZiti = true
|
||||
this.getMerchantInfo(e.mer_id);
|
||||
},
|
||||
onShow() {},
|
||||
methods: {
|
||||
getMerchantInfo(id) {
|
||||
merchantInfoAPI({
|
||||
id
|
||||
}).then(res => {
|
||||
console.log(res)
|
||||
|
||||
this.mer_name = res.data.mer_name
|
||||
this.category_name = res.data.merchantCategory.category_name
|
||||
this.images[0].img = res.data.mer_banner
|
||||
// this.images[0].img = res.data.mer_banner
|
||||
this.images[1].img = res.data.mer_avatar
|
||||
this.images[2].img = res.data.mini_banner
|
||||
// this.images[2].img = res.data.mini_banner
|
||||
if (typeof res.data.mer_certificate != 'string') {
|
||||
this.images[3].img = res.data.mer_certificate[0];
|
||||
res.data.mer_certificate.shift();
|
||||
this.imagesArr = res.data.mer_certificate;
|
||||
} else this.images[3].img = res.data.mer_certificate;
|
||||
if (this.images[3].img) this.imgUpload = false;
|
||||
if (typeof res.data.delivery_way == 'string') this.delivery_way = res.data.delivery_way.split(
|
||||
|
||||
// 初始化默认
|
||||
if (!res.data.delivery_way || res.data.delivery_way.length == 0) {
|
||||
this.delivery_way = [1, 2];
|
||||
this.isZiti = true;
|
||||
this.isKuaidi = true;
|
||||
} else {
|
||||
if (typeof res.data.delivery_way == 'string') this.delivery_way = res.data.delivery_way
|
||||
.split(
|
||||
',');
|
||||
else this.delivery_way = res.data.delivery_way;
|
||||
this.delivery_way.forEach(item => {
|
||||
if (item === '1') this.isZiti = true
|
||||
if (item === '2') this.isKuaidi = true
|
||||
})
|
||||
}
|
||||
this.takeName = res.data.mer_take_name
|
||||
this.takePhone = res.data.mer_take_phone
|
||||
this.detailSite = res.data.mer_take_address
|
||||
// this.servicePhone = res.data.service_phone
|
||||
this.servicePhone = res.data.mer_phone
|
||||
this.servicePhone = res.data.mer_phone;
|
||||
|
||||
res.data.mer_take_location ? this.longLati = res.data.mer_take_location?.join(',') : null;
|
||||
res.data.mer_take_day.forEach((item, i) => {
|
||||
res.data.mer_take_day && res.data.mer_take_day.forEach((item, i) => {
|
||||
this.dateWeek[Number(item) - 1].isCheck = true
|
||||
})
|
||||
|
||||
this.selarr = res.data.mer_take_day;
|
||||
this.type_code = res.data.type_code
|
||||
this.mer_take_time = res.data.mer_take_time
|
||||
this.intro = res.data.mer_info
|
||||
this.cruxText = res.data.mer_keyword
|
||||
this.mer_address = res.data.mer_address
|
||||
this.mer_address = res.data.mer_address;
|
||||
this.merState = res.data.mer_state === 1 ? true : false
|
||||
this.credit_buy = res.data.credit_buy === 1 ? true : false
|
||||
if (res.data.settle_cycle == 0) {
|
||||
|
|
@ -362,8 +366,6 @@
|
|||
} else {
|
||||
this.interest_rate = res.data.interest_rate
|
||||
}
|
||||
|
||||
// console.log('res', res.data);
|
||||
}).catch(err => {
|
||||
// console.log('err', err);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -213,6 +213,7 @@
|
|||
}
|
||||
|
||||
.sub-title {
|
||||
width: 440rpx;
|
||||
font-size: 24rpx;
|
||||
color: #555555;
|
||||
line-height: 45rpx;
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@
|
|||
addBank,
|
||||
searchBank,
|
||||
getById,
|
||||
getUserInfo
|
||||
getUserInfo,
|
||||
} from "@/api/user.js";
|
||||
export default {
|
||||
data() {
|
||||
|
|
|
|||
|
|
@ -123,10 +123,13 @@
|
|||
</view>
|
||||
|
||||
<!-- 提现btn -->
|
||||
<view class="withdrawal-btn tapActive" @click="handleSubmit" v-if="bankList.length !=0">
|
||||
<view class="withdrawal-btn-wrap">
|
||||
<view class="withdrawal-btn tapActive" @click="handleSubmit">
|
||||
<view class="withdrawal-btn-wrap" v-if="bankList.length != 0">
|
||||
<text>点击提现</text>
|
||||
</view>
|
||||
<view class="withdrawal-btn-wrap" v-if="bankList.length == 0 && progressCount > 0">
|
||||
<text>点击查看提现进度</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 明细按钮 -->
|
||||
|
|
@ -147,10 +150,10 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
getAdminApplyAPI
|
||||
import {
|
||||
postCreateApplyAPI,
|
||||
getAdminApplyAPI,
|
||||
progressBankList
|
||||
} from '@/api/user.js'
|
||||
import {
|
||||
searchBank
|
||||
|
|
@ -181,7 +184,8 @@
|
|||
ot_margin: '', //押金
|
||||
extract_money: '', //可提现金额
|
||||
lock_money: '', //暂存金额
|
||||
userInfo: {}
|
||||
userInfo: {},
|
||||
progressCount: 0
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -190,11 +194,10 @@
|
|||
this.getBankInfo();
|
||||
// 用户信息
|
||||
this.userInfo = JSON.parse(this.$Cache.get("USER_INFO"));
|
||||
},
|
||||
|
||||
// uni.showToast({
|
||||
// title: `我是123\n\t好的佩奇`,
|
||||
// icon: "none"
|
||||
// })
|
||||
onShow() {
|
||||
this.getBankProgress();
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
|
@ -216,6 +219,13 @@
|
|||
}
|
||||
},
|
||||
|
||||
// 第一次审核拒绝 查询审核过程
|
||||
getBankProgress() {
|
||||
progressBankList(this.mer_id).then(res => {
|
||||
this.progressCount = res.data.count;
|
||||
})
|
||||
},
|
||||
|
||||
// 添加账户
|
||||
handleToAdd() {
|
||||
//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 905 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Loading…
Reference in New Issue