mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-09 18:04:54 +08:00
parent e8d2053c69
commit 64b7a52d22
8 changed files with 287 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.js
View File

@ -9,8 +9,8 @@ let httpApiThree
let wsApi let wsApi
// 在打包之前请检查当前环境是否正确 // 在打包之前请检查当前环境是否正确
const env = 'dev'; // 开发 // const env = 'dev'; // 开发
// const env = 'prod'; // 生产 const env = 'prod'; // 生产
// const env = 'prew'; // 预上线 // const env = 'prew'; // 预上线
switch (env) { switch (env) {

5
manifest.json
View File

@ -2,8 +2,8 @@
"name": "惠农商户平台", "name": "惠农商户平台",
"appid": "__UNI__1EE148C", "appid": "__UNI__1EE148C",
"description": "", "description": "",
"versionName" : "1.4.6", "versionName": "1.4.9",
"versionCode" : 1460, "versionCode": 1490,
"transformPx": false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus": {
@ -215,4 +215,3 @@
} }
//拨打电话权限关闭 //拨打电话权限关闭
/* ios打包配置 */ /* ios打包配置 */

70
pages/product/basicSet.vue
View File

@ -1,14 +1,13 @@
<template> <template>
<view class="basic_set"> <view class="basic_set">
<!-- 老板说这里不要 -->
<view class="basice_item"> <view class="basice_item">
<view class="headline"> <view class="headline">
<view class="text flex_a_c">店铺基本配置</view> <view class="text flex_a_c">店铺基本配置</view>
</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> <view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>店铺背景图</view>
<block v-if="images[0].img"> <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" <u--image :showLoading="true" :src="images[0].img" width="680rpx" height="210.53rpx" radius="4px"
@click="delImg(0)"></u--image> @click="delImg(0)"></u--image>
</block> </block>
@ -17,6 +16,7 @@
建议尺寸：710*220px 建议尺寸：710*220px
</view> </view>
</view> </view>
<view class="store_avatar flex_a_c_j_sb"> <view class="store_avatar flex_a_c_j_sb">
<view class="avatar_box"> <view class="avatar_box">
<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>店铺头像</view> <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" <u--image :showLoading="true" @click="priviewImg(imagesArr, index)" :src="imgArr"
width="210.53rpx" height="210.53rpx" radius="4px"></u--image> width="210.53rpx" height="210.53rpx" radius="4px"></u--image>
</view> </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> </view>
</view> </view>
@ -69,7 +65,8 @@
</view> </view>
</block> </block>
</view> </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> <view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view>
<block v-if="images[2].img"> <block v-if="images[2].img">
<u--image :showLoading="true" :src="images[2].img" width="680rpx" height="210.53rpx" radius="4px" <u--image :showLoading="true" :src="images[2].img" width="680rpx" height="210.53rpx" radius="4px"
@ -91,8 +88,7 @@
<text class="sub_title">配送方式：</text> <text class="sub_title">配送方式：</text>
<view class="flex"> <view class="flex">
<checkbox-group name="" @change="checkboxChange"> <checkbox-group name="" @change="checkboxChange">
<checkbox :checked="isZiti" :value="check.ziti" /><text <checkbox :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提</text>
class="text ziti">到店自提</text>
<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text class="text">商家配送</text> <checkbox :checked="isKuaidi" :value="check.kuaidi" /><text class="text">商家配送</text>
</checkbox-group> </checkbox-group>
</view> </view>
@ -183,8 +179,6 @@
</view> </view>
<text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text> <text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text>
</view> --> </view> -->
</view> </view>
<button class="submit_btn l_center" @click="postMerchantUpdata">提交</button> <button class="submit_btn l_center" @click="postMerchantUpdata">提交</button>
@ -250,7 +244,7 @@
}, },
isZiti: false, isZiti: false,
isKuaidi: false, isKuaidi: false,
delivery_way: [1], delivery_way: [1, 2],
takeName: '', takeName: '',
takePhone: '', takePhone: '',
servicePhone: '', servicePhone: '',
@ -264,34 +258,34 @@
dateWeek: [{ dateWeek: [{
name: '星期一', name: '星期一',
id: 1, id: 1,
isCheck: false isCheck: true
}, { }, {
name: '星期二', name: '星期二',
id: 2, id: 2,
isCheck: false isCheck: true
}, { }, {
name: '星期三', name: '星期三',
id: 3, id: 3,
isCheck: false isCheck: true
}, { }, {
name: '星期四', name: '星期四',
id: 4, id: 4,
isCheck: false isCheck: true
}, { }, {
name: '星期五', name: '星期五',
id: 5, id: 5,
isCheck: false isCheck: true
}, { }, {
name: '星期六', name: '星期六',
id: 6, id: 6,
isCheck: false isCheck: true
}, { }, {
name: '星期日', name: '星期日',
id: 7, id: 7,
isCheck: false isCheck: true
}], }],
selarr: [], selarr: [1, 2, 3, 4, 5, 6, 7],
mer_take_time: [], mer_take_time: ['08:00', '18:00'],
beginTimeShow: false, beginTimeShow: false,
overTimeShow: false, overTimeShow: false,
mer_address: '', mer_address: '',
@ -307,49 +301,59 @@
}, },
onLoad(e) { onLoad(e) {
this.id = e.mer_id this.id = e.mer_id
this.getMerchantInfo(e.mer_id) this.getMerchantInfo(e.mer_id);
this.isZiti = true
}, },
onShow() {},
methods: { methods: {
getMerchantInfo(id) { getMerchantInfo(id) {
merchantInfoAPI({ merchantInfoAPI({
id id
}).then(res => { }).then(res => {
console.log(res)
this.mer_name = res.data.mer_name this.mer_name = res.data.mer_name
this.category_name = res.data.merchantCategory.category_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[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') { if (typeof res.data.mer_certificate != 'string') {
this.images[3].img = res.data.mer_certificate[0]; this.images[3].img = res.data.mer_certificate[0];
res.data.mer_certificate.shift(); res.data.mer_certificate.shift();
this.imagesArr = res.data.mer_certificate; this.imagesArr = res.data.mer_certificate;
} else this.images[3].img = res.data.mer_certificate; } else this.images[3].img = res.data.mer_certificate;
if (this.images[3].img) this.imgUpload = false; 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; else this.delivery_way = res.data.delivery_way;
this.delivery_way.forEach(item => { this.delivery_way.forEach(item => {
if (item === '1') this.isZiti = true if (item === '1') this.isZiti = true
if (item === '2') this.isKuaidi = true if (item === '2') this.isKuaidi = true
}) })
}
this.takeName = res.data.mer_take_name this.takeName = res.data.mer_take_name
this.takePhone = res.data.mer_take_phone this.takePhone = res.data.mer_take_phone
this.detailSite = res.data.mer_take_address this.detailSite = res.data.mer_take_address
// this.servicePhone = res.data.service_phone // 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_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.dateWeek[Number(item) - 1].isCheck = true
}) })
this.selarr = res.data.mer_take_day; this.selarr = res.data.mer_take_day;
this.type_code = res.data.type_code this.type_code = res.data.type_code
this.mer_take_time = res.data.mer_take_time this.mer_take_time = res.data.mer_take_time
this.intro = res.data.mer_info this.intro = res.data.mer_info
this.cruxText = res.data.mer_keyword 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.merState = res.data.mer_state === 1 ? true : false
this.credit_buy = res.data.credit_buy === 1 ? true : false this.credit_buy = res.data.credit_buy === 1 ? true : false
if (res.data.settle_cycle == 0) { if (res.data.settle_cycle == 0) {
@ -362,8 +366,6 @@
} else { } else {
this.interest_rate = res.data.interest_rate this.interest_rate = res.data.interest_rate
} }
// console.log('res', res.data);
}).catch(err => { }).catch(err => {
// console.log('err', err); // console.log('err', err);
}) })

1
pages/product/shop_type_change/index.vue
View File

@ -213,6 +213,7 @@
} }
.sub-title { .sub-title {
width: 440rpx;
font-size: 24rpx; font-size: 24rpx;
color: #555555; color: #555555;
line-height: 45rpx; line-height: 45rpx;

2
pages/withdrawal/add.vue
View File

@ -203,7 +203,7 @@
addBank, addBank,
searchBank, searchBank,
getById, getById,
getUserInfo getUserInfo,
} from "@/api/user.js"; } from "@/api/user.js";
export default { export default {
data() { data() {

26
pages/withdrawal/index.vue
View File

@ -123,10 +123,13 @@
</view> </view>
<!-- 提现btn --> <!-- 提现btn -->
<view class="withdrawal-btn tapActive" @click="handleSubmit" v-if="bankList.length !=0"> <view class="withdrawal-btn tapActive" @click="handleSubmit">
<view class="withdrawal-btn-wrap"> <view class="withdrawal-btn-wrap" v-if="bankList.length != 0">
<text>点击提现</text> <text>点击提现</text>
</view> </view>
<view class="withdrawal-btn-wrap" v-if="bankList.length == 0 && progressCount > 0">
<text>点击查看提现进度</text>
</view>
</view> </view>
<!-- 明细按钮 --> <!-- 明细按钮 -->
@ -147,10 +150,10 @@
</template> </template>
<script> <script>
getAdminApplyAPI
import { import {
postCreateApplyAPI, postCreateApplyAPI,
getAdminApplyAPI, getAdminApplyAPI,
progressBankList
} from '@/api/user.js' } from '@/api/user.js'
import { import {
searchBank searchBank
@ -181,7 +184,8 @@
ot_margin: '', //押金 ot_margin: '', //押金
extract_money: '', //可提现金额 extract_money: '', //可提现金额
lock_money: '', //暂存金额 lock_money: '', //暂存金额
userInfo: {} userInfo: {},
progressCount: 0
} }
}, },
@ -190,11 +194,10 @@
this.getBankInfo(); this.getBankInfo();
// 用户信息 // 用户信息
this.userInfo = JSON.parse(this.$Cache.get("USER_INFO")); this.userInfo = JSON.parse(this.$Cache.get("USER_INFO"));
},
// uni.showToast({ onShow() {
// title: `我是123\n\t好的佩奇`, this.getBankProgress();
// icon: "none"
// })
}, },
methods: { methods: {
@ -216,6 +219,13 @@
} }
}, },
// 第一次审核拒绝 查询审核过程
getBankProgress() {
progressBankList(this.mer_id).then(res => {
this.progressCount = res.data.count;
})
},
// 添加账户 // 添加账户
handleToAdd() { handleToAdd() {
//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户 //如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户

BIN
static/images/fb2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 905 B

BIN
static/images/fb21.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB