Merge branch 'master' of http://git.excellentkk.cn/C.C/nk-shop2.0
This commit is contained in:
cc_zbp
commit
43fa4b294b
@ -178,7 +178,7 @@
|
|||||||
console.log(11);
|
console.log(11);
|
||||||
toLogin(true);
|
toLogin(true);
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/users/login/index'
|
url: '/pages/users/login/login_copy'
|
||||||
})
|
})
|
||||||
console.log(22);
|
console.log(22);
|
||||||
return
|
return
|
||||||
@ -209,7 +209,7 @@
|
|||||||
} else {
|
} else {
|
||||||
uni.setStorageSync('auth_token', res.data.result.key);
|
uni.setStorageSync('auth_token', res.data.result.key);
|
||||||
return uni.navigateTo({
|
return uni.navigateTo({
|
||||||
url: '/pages/users/login/index'
|
url: '/pages/users/login/login_copy'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}).catch(res => {
|
}).catch(res => {
|
||||||
|
|||||||
@ -9,8 +9,8 @@ let httpApiThree
|
|||||||
// 网络接口修改此字符 小程序域名要求https
|
// 网络接口修改此字符 小程序域名要求https
|
||||||
// let httpApi = 'http://192.168.31.110:8324' // 测试
|
// let httpApi = 'http://192.168.31.110:8324' // 测试
|
||||||
if (process.env.NODE_ENV === "development") {
|
if (process.env.NODE_ENV === "development") {
|
||||||
httpApi = "https://crmeb-test.shop.lihaink.cn"
|
// httpApi = "https://crmeb-test.shop.lihaink.cn"
|
||||||
// httpApi = "http://192.168.0.109:8325"
|
httpApi = "http://192.168.0.222"
|
||||||
// #ifdef MP-WEIXIN
|
// #ifdef MP-WEIXIN
|
||||||
httpApiTwo = "http://cms.com"
|
httpApiTwo = "http://cms.com"
|
||||||
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
httpApiThree = 'http://ceshi-oa.lihaink.cn'
|
||||||
|
|||||||
@ -47,7 +47,7 @@ export function toLogin(push, pathLogin) {
|
|||||||
}
|
}
|
||||||
// #endif
|
// #endif
|
||||||
if (!pathLogin)
|
if (!pathLogin)
|
||||||
pathLogin = '/page/users/login/index'
|
pathLogin = '/page/users/login/login_copy'
|
||||||
Cache.set('login_back_url', path);
|
Cache.set('login_back_url', path);
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
if (isWeixin()) {
|
if (isWeixin()) {
|
||||||
@ -55,9 +55,9 @@ export function toLogin(push, pathLogin) {
|
|||||||
} else {
|
} else {
|
||||||
if (path !== pathLogin) {
|
if (path !== pathLogin) {
|
||||||
push ? uni.navigateTo({
|
push ? uni.navigateTo({
|
||||||
url: '/pages/users/login/index'
|
url: '/pages/users/login/login_copy'
|
||||||
}) : uni.reLaunch({
|
}) : uni.reLaunch({
|
||||||
url: '/pages/users/login/index'
|
url: '/pages/users/login/login_copy'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -65,7 +65,7 @@ export function toLogin(push, pathLogin) {
|
|||||||
|
|
||||||
// #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/users/login/index',
|
url: '/pages/users/login/login_copy',
|
||||||
})
|
})
|
||||||
// #endif
|
// #endif
|
||||||
}
|
}
|
||||||
|
|||||||
@ -499,7 +499,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "login/index",
|
"path": "login/login_copy",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "登录",
|
"navigationBarTitleText": "登录",
|
||||||
"navigationBarBackgroundColor": "#EB5447",
|
"navigationBarBackgroundColor": "#EB5447",
|
||||||
|
|||||||
@ -323,7 +323,7 @@
|
|||||||
aixinTop: 0,
|
aixinTop: 0,
|
||||||
Rotate: 0,
|
Rotate: 0,
|
||||||
currentNav: 1,
|
currentNav: 1,
|
||||||
limit: 3,
|
limit: 10,
|
||||||
page: 1,
|
page: 1,
|
||||||
oldCurrent: 1,
|
oldCurrent: 1,
|
||||||
H5ShareBox: false,
|
H5ShareBox: false,
|
||||||
|
|||||||
@ -688,6 +688,7 @@
|
|||||||
this.getCoupon();
|
this.getCoupon();
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 7:
|
||||||
|
this.loadTitle=''
|
||||||
this.getProductSpu()
|
this.getProductSpu()
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -787,6 +788,8 @@
|
|||||||
that.loadTitle = loadend ? '已全部加载' : '加载更多';
|
that.loadTitle = loadend ? '已全部加载' : '加载更多';
|
||||||
that.$set(that, 'goods', goodsList);
|
that.$set(that, 'goods', goodsList);
|
||||||
that.$set(that.where, 'page', that.where.page + 1);
|
that.$set(that.where, 'page', that.where.page + 1);
|
||||||
|
console.log(that.loadTitle);
|
||||||
|
console.log(that.loadend);
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
that.loading = false;
|
that.loading = false;
|
||||||
that.goodsLoading = false;
|
that.goodsLoading = false;
|
||||||
@ -813,7 +816,7 @@
|
|||||||
const query = uni.createSelectorQuery().in(this);
|
const query = uni.createSelectorQuery().in(this);
|
||||||
query.select('#goods').boundingClientRect(data => {
|
query.select('#goods').boundingClientRect(data => {
|
||||||
if (data.bottom < 1500 && data.top < 0) {
|
if (data.bottom < 1500 && data.top < 0) {
|
||||||
if (this.tabActive == 7) {
|
if (this.loadend == false) {
|
||||||
this.getProductSpu()
|
this.getProductSpu()
|
||||||
} else {
|
} else {
|
||||||
this.getGoods();
|
this.getGoods();
|
||||||
@ -1146,7 +1149,9 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
this.goods = []
|
this.goods = []
|
||||||
|
this.where.page=1
|
||||||
this.tabActive = param;
|
this.tabActive = param;
|
||||||
|
console.log(this.goods);
|
||||||
this.goodsLoading = this.loadend = this.loading = false
|
this.goodsLoading = this.loadend = this.loading = false
|
||||||
},
|
},
|
||||||
resetParmas() {
|
resetParmas() {
|
||||||
|
|||||||
@ -1,167 +1,172 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :style="viewColor">
|
<div :style="viewColor">
|
||||||
<div class="register absolute" v-if="!auth_token">
|
<div class="register absolute" v-if="!auth_token">
|
||||||
<div class="shading">
|
<div class="login">
|
||||||
<div class="pictrue acea-row row-center-wrapper">
|
<div class="shading">
|
||||||
<image :src="login_logo" v-if="login_logo" />
|
<div class="pictrue acea-row row-center-wrapper">
|
||||||
</div>
|
<image :src="login_logo" v-if="login_logo" />
|
||||||
</div>
|
|
||||||
<div class="whiteBg" v-if="formItem === 1">
|
|
||||||
<div class="title acea-row row-center-wrapper">
|
|
||||||
<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)" :key="index">
|
|
||||||
{{ item }}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="list" :hidden="current !== 0">
|
<div class="whiteBg" v-if="formItem === 1">
|
||||||
<form @submit.prevent="submit">
|
<div class="title acea-row row-center-wrapper">
|
||||||
|
<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)" :key="index">
|
||||||
|
{{ item }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="list" :hidden="current !== 0">
|
||||||
|
<form @submit.prevent="submit">
|
||||||
|
<div class="item">
|
||||||
|
<div class="acea-row row-middle">
|
||||||
|
<image src="/static/images/phone_1.png"></image>
|
||||||
|
<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" required />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="item">
|
||||||
|
<div class="acea-row row-middle">
|
||||||
|
<image src="/static/images/code_2.png"></image>
|
||||||
|
<input type="password" placeholder="填写登录密码" placeholder-class="placeholder" v-model="password" required />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<div class="tip">
|
||||||
|
<span @click="formItem = 2" class="font-color-red">立即注册</span>
|
||||||
|
<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
|
||||||
|
忘记密码
|
||||||
|
</navigator>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="list" :hidden="current !== 1">
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<div class="acea-row row-middle">
|
<div class="acea-row row-middle">
|
||||||
<image src="/static/images/phone_1.png"></image>
|
<image src="/static/images/phone_1.png"></image>
|
||||||
<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" required />
|
<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<div class="acea-row row-middle">
|
<div class="acea-row row-middle">
|
||||||
<image src="/static/images/code_2.png"></image>
|
<image src="/static/images/code_2.png"></image>
|
||||||
<input type="password" placeholder="填写登录密码" placeholder-class="placeholder" v-model="password" required />
|
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
|
||||||
|
<button v-debounce class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
|
||||||
|
{{ text }}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
<div class="item" v-if="isShowCode">
|
||||||
<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
|
<div class="acea-row row-middle">
|
||||||
忘记密码
|
<image src="/static/images/code_2.png"></image>
|
||||||
</navigator>
|
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="codeVal" />
|
||||||
</div>
|
<div class="code" @click="getcaptcha"><image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" /></div>
|
||||||
<div class="list" :hidden="current !== 1">
|
</div>
|
||||||
<div class="item">
|
|
||||||
<div class="acea-row row-middle">
|
|
||||||
<image src="/static/images/phone_1.png"></image>
|
|
||||||
<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="item">
|
|
||||||
<div class="acea-row row-middle">
|
<div class="logon" v-debounce @click="loginMobile" :hidden="current !== 1">登录</div>
|
||||||
<image src="/static/images/code_2.png"></image>
|
<div class="logon" v-debounce @click="submit" :hidden="current === 1">登录</div>
|
||||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
|
<div class="protocol acea-row row-between-wrapper">
|
||||||
<button v-debounce class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
|
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
||||||
{{ text }}
|
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
||||||
|
<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
|
||||||
|
</checkbox-group>
|
||||||
|
</div>
|
||||||
|
<!-- #ifdef MP -->
|
||||||
|
<view class="appLogin">
|
||||||
|
<view class="hds">
|
||||||
|
<span class="line"></span>
|
||||||
|
<p>其他方式登录</p>
|
||||||
|
<span class="line"></span>
|
||||||
|
</view>
|
||||||
|
<view class="btn-wrapper">
|
||||||
|
<button form-type="submit" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
||||||
|
<view class="btn wx">
|
||||||
|
<span class="iconfont icon-s-weixindenglu1"></span>
|
||||||
|
</view>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</view>
|
||||||
</div>
|
|
||||||
<div class="item" v-if="isShowCode">
|
|
||||||
<div class="acea-row row-middle">
|
|
||||||
<image src="/static/images/code_2.png"></image>
|
|
||||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="codeVal" />
|
|
||||||
<div class="code" @click="getcaptcha"><image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" /></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="protocol acea-row row-between-wrapper">
|
|
||||||
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
|
||||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
|
||||||
<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
|
|
||||||
</checkbox-group>
|
|
||||||
</div>
|
|
||||||
<div class="logon" v-debounce @click="loginMobile" :hidden="current !== 1">登录</div>
|
|
||||||
<div class="logon" v-debounce @click="submit" :hidden="current === 1">登录</div>
|
|
||||||
<div class="tip">
|
|
||||||
没有账号?
|
|
||||||
<span @click="formItem = 2" class="font-color-red">立即注册</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- #ifdef MP -->
|
|
||||||
<view class="appLogin">
|
|
||||||
<view class="hds">
|
|
||||||
<span class="line"></span>
|
|
||||||
<p>其他方式登录</p>
|
|
||||||
<span class="line"></span>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="btn-wrapper">
|
<!-- #endif -->
|
||||||
<button form-type="submit" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
<!-- #ifdef APP-PLUS -->
|
||||||
<view class="btn wx">
|
<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
|
||||||
|
<view class="hds">
|
||||||
|
<span class="line"></span>
|
||||||
|
<p>其他方式登录</p>
|
||||||
|
<span class="line"></span>
|
||||||
|
</view>
|
||||||
|
<view class="btn-wrapper">
|
||||||
|
<view class="btn wx" @click="wxLogin">
|
||||||
<span class="iconfont icon-s-weixindenglu1"></span>
|
<span class="iconfont icon-s-weixindenglu1"></span>
|
||||||
</view>
|
</view>
|
||||||
</button>
|
<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
|
||||||
</view>
|
<span class="iconfont icon-s-pingguo"></span>
|
||||||
</view>
|
</view>
|
||||||
<!-- #endif -->
|
|
||||||
<!-- #ifdef APP-PLUS -->
|
|
||||||
<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
|
|
||||||
<view class="hds">
|
|
||||||
<span class="line"></span>
|
|
||||||
<p>其他方式登录</p>
|
|
||||||
<span class="line"></span>
|
|
||||||
</view>
|
|
||||||
<view class="btn-wrapper">
|
|
||||||
<view class="btn wx" @click="wxLogin">
|
|
||||||
<span class="iconfont icon-s-weixindenglu1"></span>
|
|
||||||
</view>
|
|
||||||
<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
|
|
||||||
<span class="iconfont icon-s-pingguo"></span>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
<!-- #endif -->
|
||||||
<!-- #endif -->
|
|
||||||
</div>
|
|
||||||
<div class="whiteBg" v-else>
|
|
||||||
<div class="title">注册账号</div>
|
|
||||||
<div class="list">
|
|
||||||
<div class="item">
|
|
||||||
<div class="acea-row row-middle">
|
|
||||||
<image src="/static/images/phone_1.png"></image>
|
|
||||||
<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="item">
|
|
||||||
<div class="acea-row row-middle">
|
|
||||||
<image src="/static/images/code_2.png"></image>
|
|
||||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
|
|
||||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
|
|
||||||
{{ text }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="item">
|
|
||||||
<div class="acea-row row-middle">
|
|
||||||
<image src="/static/images/code_1.png"></image>
|
|
||||||
<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" v-model="password" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="item" v-if="isShowCode">
|
|
||||||
<div class="acea-row row-middle">
|
|
||||||
<image src="/static/images/code_2.png"></image>
|
|
||||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="codeVal" />
|
|
||||||
<div class="code" @click="getcaptcha"><image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" /></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="protocol acea-row row-between-wrapper">
|
<div class="whiteBg" v-else>
|
||||||
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
<div class="title">注册账号</div>
|
||||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
<div class="list">
|
||||||
<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
|
<div class="item">
|
||||||
</checkbox-group>
|
<div class="acea-row row-middle">
|
||||||
</div>
|
<image src="/static/images/phone_1.png"></image>
|
||||||
<div class="logon" @click="register">注册</div>
|
<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
|
||||||
<div class="tip">
|
</div>
|
||||||
已有账号?
|
</div>
|
||||||
<span @click="formItem = 1" class="font-color-red">立即登录</span>
|
<div class="item">
|
||||||
</div>
|
<div class="acea-row row-middle">
|
||||||
<!-- #ifdef APP-PLUS -->
|
<image src="/static/images/code_2.png"></image>
|
||||||
<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
|
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
|
||||||
<view class="hds">
|
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
|
||||||
<span class="line"></span>
|
{{ text }}
|
||||||
<p>其他方式登录</p>
|
</button>
|
||||||
<span class="line"></span>
|
</div>
|
||||||
</view>
|
</div>
|
||||||
<view class="btn-wrapper">
|
<div class="item">
|
||||||
<view class="btn wx" @click="wxLogin">
|
<div class="acea-row row-middle">
|
||||||
<span class="iconfont icon-s-weixindenglu1"></span>
|
<image src="/static/images/code_1.png"></image>
|
||||||
|
<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" v-model="password" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="item" v-if="isShowCode">
|
||||||
|
<div class="acea-row row-middle">
|
||||||
|
<image src="/static/images/code_2.png"></image>
|
||||||
|
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="codeVal" />
|
||||||
|
<div class="code" @click="getcaptcha"><image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" /></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="tip">
|
||||||
|
<div>
|
||||||
|
已有账号?
|
||||||
|
<span @click="formItem = 1" class="font-color-red">去登录</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="logon" @click="register">注册</div>
|
||||||
|
<div class="protocol acea-row row-between-wrapper">
|
||||||
|
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
||||||
|
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
||||||
|
<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
|
||||||
|
</checkbox-group>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- #ifdef APP-PLUS -->
|
||||||
|
<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
|
||||||
|
<view class="hds">
|
||||||
|
<span class="line"></span>
|
||||||
|
<p>其他方式登录</p>
|
||||||
|
<span class="line"></span>
|
||||||
</view>
|
</view>
|
||||||
<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
|
<view class="btn-wrapper">
|
||||||
<span class="iconfont icon-s-pingguo"></span>
|
<view class="btn wx" @click="wxLogin">
|
||||||
|
<span class="iconfont icon-s-weixindenglu1"></span>
|
||||||
|
</view>
|
||||||
|
<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
|
||||||
|
<span class="iconfont icon-s-pingguo"></span>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
<!-- #endif -->
|
||||||
<!-- #endif -->
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="bottom"></div>
|
<div class="bottom"></div>
|
||||||
<view class="settlementAgreement" v-if="showAgreement">
|
<view class="settlementAgreement" v-if="showAgreement">
|
||||||
@ -273,7 +278,7 @@
|
|||||||
data: function() {
|
data: function() {
|
||||||
return {
|
return {
|
||||||
navList: ["账号登录", "快速登录"],
|
navList: ["账号登录", "快速登录"],
|
||||||
current: 1,
|
current: 0,
|
||||||
account: "",
|
account: "",
|
||||||
password: "",
|
password: "",
|
||||||
captcha: "",
|
captcha: "",
|
||||||
@ -1026,6 +1031,9 @@
|
|||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
}
|
}
|
||||||
.protocol{
|
.protocol{
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
text-align: center;
|
||||||
margin-top: 30rpx;
|
margin-top: 30rpx;
|
||||||
}
|
}
|
||||||
.protocol_text{
|
.protocol_text{
|
||||||
|
|||||||
@ -286,7 +286,7 @@
|
|||||||
});
|
});
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
return that.$util.Tips({
|
return that.$util.Tips({
|
||||||
title: err,
|
title: '该商品已下架,无法取消收藏',
|
||||||
});
|
});
|
||||||
});;
|
});;
|
||||||
},
|
},
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="card-wrapper" :style="'background-image: url('+brokerage_bg+')'">
|
<view v-if="next_level" class="card-wrapper" :style="'background-image: url('+brokerage_bg+')'">
|
||||||
<view class="growth">
|
<view class="growth">
|
||||||
<!-- <view class="title">{{curLevel&&curLevel.brokerage_name || ''}}</view> -->
|
<!-- <view class="title">{{curLevel&&curLevel.brokerage_name || ''}}</view> -->
|
||||||
<view class="info">今日获得成长值{{growthValue}}点</view>
|
<view class="info">今日获得成长值{{growthValue}}点</view>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user