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

修改home/index为index/index

Browse Source
This commit is contained in:
cc_zbp 2023-05-23 09:31:01 +08:00
parent 6ef97fbed3
commit 559f48a955
5 changed files with 1108 additions and 1033 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages/gather/gather.vue
View File

@ -4,8 +4,8 @@
<u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
<block v-if="isLogin">
<view class="special_work com" v-if="userInfoData.mer_info.type_id === 12">
<!-- <view class="special_work com" v-if="true"> -->
<!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
<view class="special_work com" v-if="true">
<view class="title">市级供应链</view>
<view class="content">
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
@ -38,8 +38,8 @@
</view>
</view>
<view class="business com" v-if="userInfoData.mer_info.type_id === 10">
<!-- <view class="business com" v-if="true"> -->
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 10"> -->
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
@ -100,8 +100,8 @@
<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view>
<view class="business com" v-if="userInfoData.mer_info.type_id === 11">
<!-- <view class="business com" v-if="true"> -->
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
<view class="business com" v-if="true">
<view class="special_work com">
<view class="title">里海云仓</view>
<view class="content ">

6
pages/store/home/index.vue
View File

@ -674,7 +674,7 @@
this.getCategory();
break;
case 3:
this.where={
this.where = {
order: '',
keyword: '',
page: 1,
@ -1115,12 +1115,12 @@
// 首页
goHome() {
uni.switchTab({
url: '/pages/home/index'
url: '/pages/index/index'
});
},
// 商铺底部切换
tab: function(param) {
if(this.tabActive==param){
if (this.tabActive == param) {
return false;
}
this.goods = []

126
pages/store/settled/index.vue
View File

@ -13,27 +13,29 @@
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">商户名称</text>
<input type="text" maxlength="30" placeholder="请输入商户名称" v-model="merchantData.enterprise_name" @input="validateBtn"
placeholder-class='placeholder' />
<input type="text" maxlength="30" placeholder="请输入商户名称" v-model="merchantData.enterprise_name"
@input="validateBtn" placeholder-class='placeholder' />
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">用户姓名</text>
<input type="text" placeholder="请输入姓名" v-model="merchantData.user_name" @input="validateBtn" placeholder-class='placeholder' />
<input type="text" placeholder="请输入姓名" v-model="merchantData.user_name" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
<view class="item">
<view class="acea-row row-middle">
<text class="item-name">联系电话</text>
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn" placeholder-class='placeholder' />
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone" @input="validateBtn"
placeholder-class='placeholder' />
</view>
</view>
<view class="item rel">
<view class="acea-row row-middle">
<text class="item-name">验证码</text>
<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma" @input="validateBtn" class="codeIput"
placeholder-class='placeholder' />
<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma" @input="validateBtn"
class="codeIput" placeholder-class='placeholder' />
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
{{ text }}
</button>
@ -44,7 +46,9 @@
<text class="item-name">验证码</text>
<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal" @input="validateBtn"
placeholder-class='placeholder' />
<view class="imageCode" @click="again"><image :src="codeUrl" /></view>
<view class="imageCode" @click="again">
<image :src="codeUrl" />
</view>
</view>
</view>
<view class="item">
@ -80,7 +84,8 @@
<text class="item-title">请上传营业执照及行业相关资质证明图片</text>
<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
<view class="upload">
<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index" @click="getPhotoClickIdx">
<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
@click="getPhotoClickIdx">
<image :src='item'></image>
<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
</view>
@ -93,7 +98,8 @@
</view>
<view class="item no-border">
<checkbox-group @change='ChangeIsAgree'>
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意</checkbox-group>
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
</checkbox-group>
<button class="settleAgree" @click="getConfig">《入驻协议》</button>
</view>
<button class='submitBtn' :class="validate === true ? 'on':''" @click="formSubmit">提交申请</button>
@ -114,7 +120,8 @@
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
</view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify">
</Verify>
</view>
<view class="settledSuccessMain" v-else :style="viewColor">
<view class="settledSuccessful">
@ -212,7 +219,7 @@
beforeDestroy() {
clearTimeout(this.timer)
},
computed: configMap({sys_intention_agree:''},mapGetters(['isLogin','viewColor','keyColor'])),
computed: configMap({ sys_intention_agree: '' }, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
onLoad(options) {
if (this.isLogin) {
this.getClassfication();
@ -352,7 +359,7 @@
// 首页
goHome() {
uni.switchTab({
url: '/pages/home/index'
url: '/pages/index/index'
});
},
again() {
@ -518,7 +525,7 @@
that.validate = false;
}
}
}else{
} else {
that.validate = false;
}
},
@ -580,18 +587,22 @@
<style scoped lang="scss">
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme)!important;
background-color: var(--view-theme)!important;
color: #fff!important;
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
color: #fff !important;
}
.uni-input-placeholder {
color: #B2B2B2;
}
.item-name{
.item-name {
width: 190rpx;
}
.uni-list-cell {
position: relative;
.iconfont {
font-size: 14px;
color: #7a7a7a;
@ -599,21 +610,26 @@
right: 15px;
top: 7rpx;
}
.icon-guanbi2{
.icon-guanbi2 {
right: 35px;
}
}
.merchantBgCount{
.merchantBgCount {
line-height: 0;
}
.merchantsSettled {
background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
height: 140vh;
}
.merchantsSettled .merchantBg {
width: 750rpx;
width: 100%;
}
.merchantsSettled .list {
background-color: #fff;
border-radius: 12px;
@ -624,6 +640,7 @@
width: calc(100% - 30px);
}
.application-record {
position: absolute;
display: flex;
@ -636,21 +653,25 @@
padding: 8rpx 18rpx;
border-radius: 20px 0px 0px 20px;
}
.merchantsSettled .list .item {
padding: 50rpx 0 20rpx;
border-bottom: 1px solid #eee;
position: relative;
margin: 0 20px;
&.no-border {
border-bottom: none;
padding-left: 0;
padding-right: 0;
}
.item-title {
color: #666666;
font-size: 28rpx;
display: block;
}
.item-desc {
color: #B2B2B2;
font-size: 22rpx;
@ -659,7 +680,9 @@
line-height: 36rpx;
}
}
.acea-row,.upload {
.acea-row,
.upload {
display: -webkit-box;
display: -moz-box;
display: -webkit-flex;
@ -672,9 +695,11 @@
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
.upload {
margin-top: 20rpx;
}
.acea-row.row-middle {
-webkit-box-align: center;
-moz-box-align: center;
@ -684,6 +709,7 @@
align-items: center;
padding-left: 2px;
}
.acea-row.row-column {
-webkit-box-orient: vertical;
-moz-box-orient: vertical;
@ -692,6 +718,7 @@
-ms-flex-direction: column;
flex-direction: column;
}
.acea-row.row-center-wrapper {
-webkit-box-align: center;
-moz-box-align: center;
@ -706,6 +733,7 @@
-webkit-justify-content: center;
justify-content: center;
}
.merchantsSettled .list .item .pictrue {
width: 130rpx;
height: 130rpx;
@ -713,18 +741,22 @@
position: relative;
font-size: 11px;
color: #bbb;
&:nth-child(4n) {
margin-right: 0;
}
&:nth-last-child(1) {
border: 0.5px solid #ddd;
box-sizing: border-box;
}
uni-image,
image {
width: 100%;
height: 100%;
border-radius: 1px;
img {
-webkit-touch-callout: none;
-webkit-user-select: none;
@ -738,6 +770,7 @@
height: 100%;
}
}
.icon-guanbi1 {
font-size: 33rpx;
position: absolute;
@ -745,10 +778,12 @@
right: -10px;
}
}
.uni-list-cell-db{
.uni-list-cell-db {
position: relative;
}
.wenhao{
.wenhao {
width: 34rpx;
height: 34rpx;
display: flex;
@ -757,44 +792,53 @@
font-size: 28rpx;
border-radius: 50%;
background: #E3E3E3;
color: #ffffff!important;
color: #ffffff !important;
margin-left: 4rpx;
position: absolute;
left: 122rpx;
}
.merchantsSettled .list .item .imageCode {
position: absolute;
top: 7px;
right: 0;
}
.merchantsSettled .list .item .icon {
font-size: 40rpx;
color: #b4b1b4;
}
.merchantsSettled .list .item input {
width: 400rpx;
font-size: 30rpx;
}
.merchantsSettled .list .item .placeholder {
color: #b2b2b2;
}
.merchantsSettled .default {
padding: 0 30rpx;
height: 90rpx;
background-color: #fff;
margin-top: 23rpx;
}
.merchantsSettled .default checkbox {
margin-right: 15rpx;
}
.merchantsSettled .acea-row uni-image {
width: 20px;
height: 20px;
display: block;
}
.merchantsSettled .list .item .codeIput {
width: 125px;
}
.uni-input-input {
display: block;
height: 100%;
@ -810,6 +854,7 @@
text-transform: inherit;
text-shadow: inherit;
}
.merchantsSettled .list .item .code {
position: absolute;
width: 93px;
@ -822,11 +867,13 @@
right: 0;
font-size: 12px;
}
.merchantsSettled .list .item .code.on {
background-color: #bbb;
color: #fff;
border-color: #bbb;
}
.merchantsSettled .submitBtn {
width: 588rpx;
margin: 0 auto;
@ -840,30 +887,36 @@
margin-top: 25px;
pointer-events: none;
}
.merchantsSettled .submitBtn.on {
background: var(--view-theme);
pointer-events: all;
}
uni-checkbox-group,
.settleAgree {
display: inline-block;
font-size: 24rpx;
}
uni-checkbox-group {
color: #b2b2b2;
}
.settleAgree {
color: var(--view-theme);
position: relative;
top: 2px;
left: 8px;
}
.merchantsSettled uni-checkbox .uni-checkbox-wrapper {
width: 30rpx;
height: 30rpx;
border: 2rpx solid #C3C3C3;
border-radius: 15px;
}
.settlementAgreement {
width: 100%;
height: 100%;
@ -873,6 +926,7 @@
background: rgba(0, 0, 0, .5);
z-index: 10;
}
.settlementAgreement .setAgCount {
background: #fff;
width: 656rpx;
@ -887,18 +941,22 @@
-moz-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
overflow: hidden;
.content {
height: 900rpx;
overflow-y: scroll;
/deep/ p {
font-size: 13px;
line-height: 22px;
}
/deep/ img {
max-width: 100%;
}
}
}
.settlementAgreement .setAgCount .icon {
font-size: 42rpx;
color: #b4b1b4;
@ -906,12 +964,14 @@
top: 15rpx;
right: 15rpx;
}
.settlementAgreement .setAgCount .title {
color: #333;
font-size: 32rpx;
text-align: center;
font-weight: bold;
}
.settlementAgreement .setAgCount .content {
margin-top: 32rpx;
color: #333;
@ -922,12 +982,14 @@
height: 756rpx;
overflow-y: scroll;
}
.settledSuccessMain {
height: 100vh;
display: flex;
flex-direction: column;
background: #fff;
}
.settledSuccessful {
flex: 1;
width: 100%;
@ -936,22 +998,26 @@
background: #fff;
text-align: center;
}
.settledSuccessful .image {
width: 189px;
height: 157px;
margin-top: 66px;
}
.settledSuccessful .title {
color: #333333;
font-size: 16px;
font-weight: bold;
margin-top: 35px;
}
.settledSuccessful .info {
color: #A0A0A0;
font-size: 13px;
margin-top: 12px;
}
.settledSuccessful .goHome {
margin: 60px auto 0;
line-height: 43px;
@ -960,14 +1026,17 @@
border: 1px solid #B4B4B4;
border-radius: 60px;
}
/deep/ uni-checkbox .uni-checkbox-input {
width: 15px;
height: 15px;
position: relative;
}
/deep/ uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before {
font-size: 14px;
}
.loadingicon {
height: 100vh;
overflow: hidden;
@ -975,21 +1044,26 @@
top: 0;
left: 0;
}
.icon-xiangyou {
font-size: 22rpx;
}
// #ifdef MP
checkbox-group {
display: inline-block;
}
// #endif
.setAgCount{
/deep/ table{
.setAgCount {
/deep/ table {
border: 1px solid #DDD;
border-bottom: none;
border-right: none;
}
/deep/ td, th {
/deep/ td,
th {
padding: 5rpx 10rpx;
border-bottom: 1px solid #DDD;
border-right: 1px solid #DDD;

15
pages/users/login/index.vue
View File

@ -199,15 +199,16 @@
// #ifdef MP
//用户没有绑定openid，授权并绑定
if (data.user.wechat_user_id === 0) {
let that=this
let that = this
wx.getUserInfo({
success: function (res) {
success: function(res) {
const encryptedData = res.encryptedData
const iv = res.iv
wx.login({
success (res) {
success(res) {
if (res.code) {
bindMp({code: res.code, iv: iv, encryptedData: encryptedData,phone: that.account}).then(res => {
bindMp({ code: res.code, iv: iv, encryptedData: encryptedData, phone: that
.account }).then(res => {
// console.log(res);
})
} else {
@ -224,7 +225,7 @@
// #endif
console.log('验证码登录', data);
let time = data.expires_time - Cache.time();
const backUrl = that.$Cache.get(BACK_URL) || "/pages/home/index";
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
that.$Cache.clear(BACK_URL);
that.$store.commit("LOGIN", {
'token': data.token,
@ -238,7 +239,7 @@
Cache.set(USER_INFO, data.user, time);
// #endif
let method
let indexPat = ['/pages/home/index', '/pages/order_addcart/order_addcart',
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
'/pages/goods_cate/goods_cate',
'/pages/user/index'
]
@ -249,7 +250,7 @@
}
if (this.getPath(backUrl) === '/pages/users/login/index') {
uni.switchTab({
url: '/pages/home/index'
url: '/pages/index/index'
});
return
}

2
pages/users/user_info/index.vue
View File

@ -305,7 +305,7 @@
.then(res => {
that.$store.commit("LOGOUT");
uni.reLaunch({
url: '/pages/home/index',
url: '/pages/index/index',
});
})
.catch(err => {