mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
zmj 2024-02-22 10:27:29 +08:00
parent b728bf6a4f
commit e6e328dfd5
3 changed files with 200 additions and 168 deletions
api
activity.js
pages
helpPeople
formTable.vue
store/settled
unit.vue

18
api/activity.js

@ -202,7 +202,7 @@ export function getTopicList(id, data) {
* 活动专题详情
*/
export function getTopicDetail(id) {
return request.get(`activity/info/${id}`,{}, {
return request.get(`activity/info/${id}`, {}, {
noAuth: true
});
}
@ -210,7 +210,7 @@ export function getTopicDetail(id) {
* 活动专题商品
*/
export function getTopicProLst(data) {
return request.get(`product/spu/labels`,data, {
return request.get(`product/spu/labels`, data, {
noAuth: true
});
}
@ -218,7 +218,7 @@ export function getTopicProLst(data) {
* 获取本地服务商户列表
*/
export function getMerchantServiceLst(data) {
return request.get(`store/merchant/local`,data, {
return request.get(`store/merchant/local`, data, {
noAuth: true
});
}
@ -226,7 +226,7 @@ export function getMerchantServiceLst(data) {
* 获取优惠券列表
*/
export function getCouponLst(data) {
return request.get(`coupon/getlst`,data, {
return request.get(`coupon/getlst`, data, {
noAuth: true
});
}
@ -234,7 +234,7 @@ export function getCouponLst(data) {
* 获取优惠券列表
*/
export function getNewPeopleCouponLst(data) {
return request.get(`coupon/new_people`,data, {
return request.get(`coupon/new_people`, data, {
noAuth: true
});
}
@ -242,7 +242,7 @@ export function getNewPeopleCouponLst(data) {
* 获取热卖排行列表
*/
export function hotRankingApi(data) {
return request.get(`product/spu/get_hot_ranking`,data, {
return request.get(`product/spu/get_hot_ranking`, data, {
noAuth: true
});
}
@ -318,3 +318,9 @@ export function qrcode(data) {
export function merchantRecord(data) {
return request.get(`merchantRecord`, data);
}
// 生成二维码
export function mer_services_agree() {
return request.get(`agreement/mer_services_agree`);
}

10
pages/helpPeople/formTable.vue

@ -70,7 +70,7 @@
</view>
</view>
<!-- :style="{height:isOpen[0]?'0':getFormHeight('#formheight')+'px',padding: isOpen[0]?'0':'20rpx' } " -->
<view class="card-content" :style="{height:isOpen[0]?'0':domHeight[0],padding: isOpen[0]?'0':'20rpx' } "
<view class="card-content" :style="{height:isOpen[0]?'0':'auto',padding: isOpen[0]?'0':'20rpx' } "
style="height: 0;padding: 0;">
<view id="formheight1">
<view class="form-tit">
@ -160,7 +160,7 @@
</view>
</view>
<view class="card-content" :style="{height:isOpen[1]?'0':domHeight[1],padding: isOpen[1]?'0':'20rpx' } "
<view class="card-content" :style="{height:isOpen[1]?'0':'auto',padding: isOpen[1]?'0':'20rpx' } "
style="height: 0;padding: 0;">
<view id="formheight2">
<view class="form-tit">
@ -275,7 +275,7 @@
</view>
</view>
<view class="card-content" :style="{height:isOpen[2]?'0':domHeight[2],padding: isOpen[2]?'0':'20rpx' } "
<view class="card-content" :style="{height:isOpen[2]?'0':'auto',padding: isOpen[2]?'0':'20rpx' } "
style="height: 0;padding: 0;">
<view id='formheight3'>
<view class="form-tit">
@ -463,7 +463,7 @@
</view>
</view>
<view class="card-content" :style="{height:isOpen[3]?'0':domHeight[3],padding: isOpen[3]?'0':'20rpx' } "
<view class="card-content" :style="{height:isOpen[3]?'0':'auto',padding: isOpen[3]?'0':'20rpx' } "
style="height: 0;padding: 0;">
<view id='formheight4'>
<view class="form-tit">
@ -553,7 +553,7 @@
</view>
</view>
<view class="card-content" :style="{height:isOpen[4]?'0':domHeight[4],padding: isOpen[4]?'0':'20rpx' } "
<view class="card-content" :style="{height:isOpen[4]?'0':'auto',padding: isOpen[4]?'0':'20rpx' } "
style="height: 0;padding: 0;">
<view id='formheight5'>
<view class="form-tit">

94
pages/store/settled/unit.vue

@ -17,8 +17,8 @@
<form report-submit='true'>
<view class='merchantsSettled'>
<view class="merchantBgCount">
<image mode="widthFix" class="merchantBg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png"
alt="">
<image mode="widthFix" class="merchantBg"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png" alt="">
</view>
<view class="application-record" @click="jumpToList" v-if="!mer_i_id">
申请记录
@ -36,9 +36,8 @@
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">姓名</text>
<input type="text" maxlength="30" placeholder="请输入姓名"
v-model="merchantData.user_name" @input="validateBtn"
placeholder-class='placeholder' />
<input type="text" maxlength="30" placeholder="请输入姓名" v-model="merchantData.user_name"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
@ -121,7 +120,8 @@
<view v-if="business_license" class='pictrue' @click='uploadpicText'>
<image :src='business_license'></image>
</view>
<view v-else class='pictrue acea-row row-center-wrapper row-column' @click='uploadpicText'>
<view v-else class='pictrue acea-row row-center-wrapper row-column'
@click='uploadpicText'>
<text class='iconfont icon-icon25201'></text>
<view>上传图片</view>
</view>
@ -134,7 +134,14 @@
</checkbox-group>
<button class="settleAgree" @click="getConfig">《入驻协议》</button>
</view> -->
<view class="item no-border">
<checkbox-group @change='ChangeIsAgree'>
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
</checkbox-group>
<button class="settleAgree" @click="getConfig(0)">《入驻协议》 </button>
<button class="settleAgree" @click="getConfig(1)">《商户服务协议》 </button>
</view>
<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
提交申请
</button>
@ -144,7 +151,8 @@
<view class="settlementAgreement" v-if="showProtocol">
<view class="setAgCount" style="width: 656rpx;height: 458px;">
<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
<div class="title" v-if='titFlag'>{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
<div class="title" v-else></div>
<view class="content">
<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
<!-- <view v-html="protocol"></view> -->
@ -178,7 +186,8 @@
<!-- <button class="setAgCountbtna" @click="refuse">
拒绝
</button> -->
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0" @click="agree">
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
@click="agree">
<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
<text v-else>同意本协议</text>
</button>
@ -252,7 +261,12 @@
import {
HTTP_REQUEST_URL
} from '@/config/app';
import { Toast } from '../../../libs/uniApi';
import {
Toast
} from '../../../libs/uniApi';
import {
mer_services_agree
} from "@/api/activity.js"
const app = getApp();
export default {
components: {
@ -262,6 +276,7 @@ import { Toast } from '../../../libs/uniApi';
},
data() {
return {
titFlag: true,
company: '',
organization_code: '',
domain: HTTP_REQUEST_URL,
@ -288,7 +303,7 @@ import { Toast } from '../../../libs/uniApi';
address: '',
invitation_code: '',
},
business_license: '',//营业执照
business_license: '', //营业执照
validate: false,
successful: false,
keyCode: "",
@ -365,8 +380,7 @@ import { Toast } from '../../../libs/uniApi';
this.$nextTick(function() {
this.getGoodsDetails(options.mer_i_id)
})
}
else this.getArea()
} else this.getArea()
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
},
onShow() {
@ -449,10 +463,10 @@ import { Toast } from '../../../libs/uniApi';
street_code: e
}).then(res => {
self.$set(self.business, 2, res.data);
if(self.mer_i_id&&!this.business_name){
let area = self.business[0].find(item=>item.code==self.area_id)?.name;
let street = self.business[1].find(item=>item.code==self.street_id)?.name;
let village = self.business[2].find(item=>item.id==self.village_id)?.name;
if (self.mer_i_id && !this.business_name) {
let area = self.business[0].find(item => item.code == self.area_id)?.name;
let street = self.business[1].find(item => item.code == self.street_id)?.name;
let village = self.business[2].find(item => item.id == self.village_id)?.name;
this.business_name = `${area} ${street} ${village}`;
this.getArea();
}
@ -465,11 +479,11 @@ import { Toast } from '../../../libs/uniApi';
area_code: e
}).then(res => {
self.$set(self.business, 1, res.data)
self.getVillage(street?street:self.business[1][0].code)
self.getVillage(street ? street : self.business[1][0].code)
})
},
//获取区
getArea(code=null, street=null) {
getArea(code = null, street = null) {
getArea({
city_code: 510500
}).then(res => {
@ -493,16 +507,27 @@ import { Toast } from '../../../libs/uniApi';
this.index2[2] = e.detail.value
}
},
getConfig() {
getConfig(type) {
this.isType = false;
this.showProtocol = true;
// 获取配置
if (type == 0) {
this.titFlag = true
this.protocol = this.sys_intention_agree
} else {
this.titFlag = false
mer_services_agree().then(res => {
this.protocol = res.data.mer_services_agree
})
}
// 获取配置
// this.protocol = this.sys_intention_agree
},
/*获取发票说明*/
getAgreement() {
let that = this
that.showProtocol = true;
that.titFlag = true
that.isType = true
getAgreementApi('sys_merchant_type').then(res => {
that.protocol = res.data.sys_merchant_type
@ -537,9 +562,9 @@ import { Toast } from '../../../libs/uniApi';
this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
this.business_name = '';
this.getArea(this.area_id, this.street_id);
if(resData.mer_type_id!=12){
if (resData.mer_type_id != 12) {
this.shoplist('mer_services_agree')
}else{
} else {
this.shoplist('mer_supply_agree')
}
uni.hideLoading();
@ -562,8 +587,8 @@ import { Toast } from '../../../libs/uniApi';
}
},
// 选择公司性质
natureBusinessChange(e){
this.nature_business = this.companyTypeList[e.detail.value]=='个体户'?2:1;
natureBusinessChange(e) {
this.nature_business = this.companyTypeList[e.detail.value] == '个体户' ? 2 : 1;
},
bindPickerChange: function(e) {
// console.log(e.detail);
@ -576,9 +601,9 @@ import { Toast } from '../../../libs/uniApi';
// this.mer_classification = this.bindPickerChangeidx[idx]['cate_name']
this.validateBtn()
},
columnchange(e){
columnchange(e) {
// console.log(e.detail);
if(e.detail.column==0){
if (e.detail.column == 0) {
this.bindPickerChangeidx = this.array[e.detail.value].children;
}
},
@ -589,9 +614,9 @@ import { Toast } from '../../../libs/uniApi';
this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
this.mer_storeType = this.storeTypeArr[idx]['type_name']
// console.log(this.merchantData.mer_type)
if(this.storeTypeArr[idx]['type_code']== 'TypeStore'&&this.merchantData.mer_type){
if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
this.shoplist('mer_services_agree')
}else{
} else {
this.shoplist('mer_supply_agree')
}
this.validateBtn()
@ -605,8 +630,8 @@ import { Toast } from '../../../libs/uniApi';
this.area_id = this.business[0][this.index2[0]].code
this.street_id = this.business[1][this.index2[1]].code
this.village_id = this.business[2][this.index2[2]].id
return ; // 个人入驻也不需要
if(this.merchantData.mer_type==12) return ; //市级供应链不需要查询镇农科公司
return; // 个人入驻也不需要
if (this.merchantData.mer_type == 12) return; //市级供应链不需要查询镇农科公司
merstreet({
street_code: this.street_id
}).then((res) => {
@ -840,7 +865,7 @@ import { Toast } from '../../../libs/uniApi';
let requestData = {
phone: that.merchantData.phone,
// mer_name: that.merchantData.enterprise_name,
mer_name: that.merchantData.user_name+'的个人店铺',
mer_name: that.merchantData.user_name + '的个人店铺',
name: that.merchantData.user_name,
code: that.merchantData.yanzhengma,
// company_name: that.merchantData.company_name,
@ -1496,17 +1521,18 @@ import { Toast } from '../../../libs/uniApi';
}
.border{
.border {
position: absolute;
top: 0;
left: -28rpx;
width: 100vw;
height: 100%;
border-radius: 40rpx 40rpx 0 0;
box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */
box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2);
/* 在上边框添加阴影 */
}
.btn{
.btn {
width: 694rpx;
font-weight: bold;
font-size: 34rpx;