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:
weipengfei 2024-02-27 18:09:55 +08:00
parent 6686a27943
commit 72ff135b05
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/Authorize.vue
View File

@ -101,8 +101,8 @@
title: '用户登录', title: '用户登录',
info: '请登录，将为您提供更好的服务！', info: '请登录，将为您提供更好的服务！',
//#ifdef H5 //#ifdef H5
// isWeixin: this.$wechat.isWeixin(), isWeixin: this.$wechat.isWeixin(),
isWeixin: false, // 关闭微信公众号授权登录 // isWeixin: false, // 关闭微信公众号授权登录
//#endif //#endif
//#ifdef MP //#ifdef MP
title: '授权提醒', title: '授权提醒',
@ -193,7 +193,7 @@
url: '/pages/users/login/login_copy' url: '/pages/users/login/login_copy'
}) })
// console.log(22); // console.log(22);
return return;
let self = this; let self = this;
Routine.getUserProfile() Routine.getUserProfile()
.then(res => { .then(res => {

8
libs/login.js
View File

@ -51,10 +51,10 @@ export function toLogin(push, pathLogin) {
Cache.set('login_back_url', path); Cache.set('login_back_url', path);
// #ifdef H5 // #ifdef H5
if (isWeixin()) { if (isWeixin()) {
// auth.oAuth(); auth.oAuth();
uni.navigateTo({ // uni.navigateTo({
url: '/pages/users/login/login_copy', // url: '/pages/users/login/login_copy',
}) // })
} else { } else {
if (path !== pathLogin) { if (path !== pathLogin) {
push ? uni.navigateTo({ push ? uni.navigateTo({

2
pages/index/index.vue
View File

@ -613,7 +613,7 @@ import activityCard from "@/components/activityCard.vue"
// url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}&source=103&location=${this.latitude},${this.longitude}` // url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}&source=103&location=${this.latitude},${this.longitude}`
// }) // })
uni.navigateTo({ uni.navigateTo({
url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${this.street_id}&townName=${this.town}&source=103&location=${this.latitude},${this.longitude}` url: `pages/cloud_warehouse/big_classification/index`
}) })
}, },

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

@ -136,7 +136,7 @@
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name businessBox">详细地址</text> <text class="item-name businessBox">详细地址</text>
<input type="text" maxlength="30" placeholder="请输入详细地址" <input type="text" maxlength="30" placeholder="自动识别"
v-model="merchantData.address" @input="validateBtn" v-model="merchantData.address" @input="validateBtn"
placeholder-class='placeholder' /> placeholder-class='placeholder' />
@ -149,7 +149,7 @@
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name businessBox">公司名称</text> <text class="item-name businessBox">公司名称</text>
<input type="text" maxlength="30" placeholder="请输入公司名称" <input type="text" maxlength="30" placeholder="自动识别"
v-model="merchantData.company_name" @input="validateBtn" v-model="merchantData.company_name" @input="validateBtn"
placeholder-class='placeholder' /> placeholder-class='placeholder' />
@ -160,7 +160,7 @@
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">法人名称</text> <text class="item-name">法人名称</text>
<input type="text" placeholder="请输入法人名称" v-model="merchantData.user_name" <input type="text" placeholder="自动识别" v-model="merchantData.user_name"
@input="validateBtn" placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
@ -169,7 +169,7 @@
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name businessBox">社会信用代码</text> <text class="item-name businessBox">社会信用代码</text>
<input type="text" maxlength="30" placeholder="请输入社会信用代码" <input type="text" maxlength="30" placeholder="自动识别"
v-model="merchantData.social_credit_code" @input="validateBtn" v-model="merchantData.social_credit_code" @input="validateBtn"
placeholder-class='placeholder' /> placeholder-class='placeholder' />
@ -715,9 +715,9 @@ import { Toast } from '../../../libs/uniApi';
if (res.code == 0) { if (res.code == 0) {
this.company = '' this.company = ''
this.organization_code = '' this.organization_code = ''
this.$util.Tips({ // this.$util.Tips({
title: res.msg // title: res.msg
}); // });
return false; return false;
} else { } else {
this.company = res.data.title this.company = res.data.title