二期修改
parent
968c193ebd
commit
53af2cd9de
|
|
@ -2,10 +2,15 @@
|
||||||
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
|
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
|
||||||
"version": "0.0",
|
"version": "0.0",
|
||||||
"configurations": [{
|
"configurations": [{
|
||||||
"type": "uniCloud",
|
"default" :
|
||||||
"default": {
|
{
|
||||||
"launchtype": "local"
|
"launchtype" : "local"
|
||||||
}
|
},
|
||||||
|
"mp-weixin" :
|
||||||
|
{
|
||||||
|
"launchtype" : "local"
|
||||||
|
},
|
||||||
|
"type" : "uniCloud"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
16
App.vue
16
App.vue
|
|
@ -36,21 +36,9 @@
|
||||||
|
|
||||||
},
|
},
|
||||||
onShow: function() {
|
onShow: function() {
|
||||||
// wx.checkSession({ //检测当前用户的session_key是否过期
|
setTimeout(()=>{
|
||||||
// success: function() { //session_key 未过期，并且在本生命周期一直有效
|
|
||||||
// if(uni.getStorageSync('token')!=''){
|
|
||||||
toolAll.tools.guoq()
|
toolAll.tools.guoq()
|
||||||
// }
|
},3000)
|
||||||
// },fail() {
|
|
||||||
// toolAll.tools.showToast('您目前是游客，请授权登录')
|
|
||||||
// setTimeout(()=>{
|
|
||||||
// uni.navigateTo({
|
|
||||||
// url:'/pages/login/login'
|
|
||||||
// })
|
|
||||||
// },1000)
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
console.log('App Show');
|
|
||||||
},
|
},
|
||||||
onHide: function() {
|
onHide: function() {
|
||||||
// console.log('App Hide');
|
// console.log('App Hide');
|
||||||
|
|
|
||||||
|
|
@ -184,6 +184,8 @@
|
||||||
.borbot{border-bottom: 1rpx solid rgba(240,240,240,.9);}
|
.borbot{border-bottom: 1rpx solid rgba(240,240,240,.9);}
|
||||||
.borbot:last-child{border-bottom: none;}
|
.borbot:last-child{border-bottom: none;}
|
||||||
.dangShai{background-color: #e4ebf7;font-size: 28rpx;font-weight: bold;}
|
.dangShai{background-color: #e4ebf7;font-size: 28rpx;font-weight: bold;}
|
||||||
|
.dangShait{background-color: #f5f5f5;font-size: 28rpx;font-weight: bold;}
|
||||||
|
.xbort{border-bottom: 1rpx solid #f1f1f1;}
|
||||||
.progc{width: 54rpx;height: 54rpx;}
|
.progc{width: 54rpx;height: 54rpx;}
|
||||||
.catebold{color: #1c4594;font-weight: bold;}
|
.catebold{color: #1c4594;font-weight: bold;}
|
||||||
/* 购物车 */
|
/* 购物车 */
|
||||||
|
|
@ -280,7 +282,10 @@ button:after{content: none!important;}
|
||||||
.ptab{position: fixed;left: 0;right: 0;padding: 0 20rpx 20rpx 20rpx;}
|
.ptab{position: fixed;left: 0;right: 0;padding: 0 20rpx 20rpx 20rpx;}
|
||||||
.plist{margin-top: 210rpx;margin-bottom: 20rpx;}
|
.plist{margin-top: 210rpx;margin-bottom: 20rpx;}
|
||||||
.searchlist{margin-bottom: 20rpx;}
|
.searchlist{margin-bottom: 20rpx;}
|
||||||
.pchoose{position: fixed;right: 0;bottom: 0;width: 180rpx;}
|
.pchoose{position: fixed;right: 0;bottom: 0;min-width: 200rpx;z-index: 6;}
|
||||||
|
.shaiEnd:last-child{
|
||||||
|
margin-bottom: 120rpx;
|
||||||
|
}
|
||||||
.switch-qiu{margin-top: 4rpx;}
|
.switch-qiu{margin-top: 4rpx;}
|
||||||
.tan-box{position: fixed;top: 50%;left: 50%;transform: translate(-50%,-50%);z-index: 101;border-radius: 30rpx;background-color: #FFFFFF;}
|
.tan-box{position: fixed;top: 50%;left: 50%;transform: translate(-50%,-50%);z-index: 101;border-radius: 30rpx;background-color: #FFFFFF;}
|
||||||
.orderRight{position: absolute;right: 10rpx;text-align: right;}
|
.orderRight{position: absolute;right: 10rpx;text-align: right;}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
<button v-if="showKf" class="fon24 bottoc posia" style="opacity: 0;" open-type="contact" bindcontact="huik">客服</button>
|
<button v-if="showKf" class="fon24 bottoc posia" style="opacity: 0;" open-type="contact" bindcontact="huik">客服</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="disac">
|
<view v-if="user_type!='personal'" class="disac">
|
||||||
<view @tap="diaoq" class="margin-y20 textc bottoj">加入购物车</view>
|
<view @tap="diaoq" class="margin-y20 textc bottoj">加入购物车</view>
|
||||||
<view @tap="diaoq" class="textc bottol">立即购买</view>
|
<view @tap="diaoq" class="textc bottol">立即购买</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -88,7 +88,8 @@
|
||||||
sku_id:'',
|
sku_id:'',
|
||||||
srcImg:'',
|
srcImg:'',
|
||||||
orderList:[],
|
orderList:[],
|
||||||
showKf:true
|
showKf:true,
|
||||||
|
user_type:uni.getStorageSync('user_type')//权限
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch:{
|
watch:{
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<view style="transform: scale(0.7);margin-top: -1rpx;">放心购</view>
|
<view style="transform: scale(0.7);margin-top: -1rpx;">放心购</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<image @tap="addChe(item.id)" class="pche" src="/static/img/public/gouwcar.png"></image>
|
<image v-if="user_type!='personal'" @tap="addChe(item.id)" class="pche" src="/static/img/public/gouwcar.png"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="dataList.length==0" class="kongk width100 text-center">空空如也</view>
|
<view v-if="dataList.length==0" class="kongk width100 text-center">空空如也</view>
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
user_type:uni.getStorageSync('user_type')//权限
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods:{
|
methods:{
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ const tools = {
|
||||||
this.loginEv()
|
this.loginEv()
|
||||||
} else if(uni.getStorageSync('token')==''){
|
} else if(uni.getStorageSync('token')==''){
|
||||||
this.loginEv()
|
this.loginEv()
|
||||||
} else {
|
} else if(uni.getStorageSync('is_active')=='' || uni.getStorageSync('is_active')==0){
|
||||||
this.loginEv()
|
this.loginEv()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -92,6 +92,7 @@ const tools = {
|
||||||
uni.setStorageSync('openid',res.data.data.openid)//缓存Openid
|
uni.setStorageSync('openid',res.data.data.openid)//缓存Openid
|
||||||
uni.setStorageSync('expire',res.data.data.expire)//缓存失效时间（时间戳格式）
|
uni.setStorageSync('expire',res.data.data.expire)//缓存失效时间（时间戳格式）
|
||||||
uni.setStorageSync('is_active',res.data.data.is_active)//是否第一次授权
|
uni.setStorageSync('is_active',res.data.data.is_active)//是否第一次授权
|
||||||
|
uni.setStorageSync('user_type',res.data.data.user_type)//权限
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fail: e => {
|
fail: e => {
|
||||||
|
|
@ -186,42 +187,6 @@ const tools = {
|
||||||
},time)
|
},time)
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
|
||||||
checkGuo(){
|
|
||||||
let invalidTime = uni.getStorageSync('expire')//获取过期时间戳
|
|
||||||
let dangTime = Math.round(new Date()/1000)//获取当前时间戳
|
|
||||||
// if(invalidTime==''){//当前时间戳减过期时间戳大于零，就表示已过期
|
|
||||||
// uni.showToast({title:'您当前是游客，请授权登录',icon:'none',duration:2000})
|
|
||||||
// setTimeout(function(){
|
|
||||||
// uni.reLaunch({url:'/pages/login/login'})//跳转到授权登录页
|
|
||||||
// },2000)
|
|
||||||
// }
|
|
||||||
// console.log('dangTime-invalidTime:',(dangTime-invalidTime));
|
|
||||||
// if(dangTime-invalidTime>=0){
|
|
||||||
uni.request({
|
|
||||||
url: `https://dengrui.scdxtc.cn/api/user/wxAppletsLogin`,
|
|
||||||
method: 'post',
|
|
||||||
data: uni.getStorageSync('params'),
|
|
||||||
header: {
|
|
||||||
'Content-Type': 'application/json; charset=UTF-8',
|
|
||||||
// "content-type": "application/x-www-form-urlencoded;charset=UTF-8",
|
|
||||||
'Authorization': 'Bearer '+uni.getStorageSync('token') || ''
|
|
||||||
},
|
|
||||||
success: res => {
|
|
||||||
console.log(res);
|
|
||||||
console.log('token:',uni.getStorageSync('token'));
|
|
||||||
if(res.data.token!=''){
|
|
||||||
uni.setStorageSync('token',res.data.token)//缓存token
|
|
||||||
uni.setStorageSync('openid',res.data.openid)//缓存Openid
|
|
||||||
uni.setStorageSync('expire',res.data.expire)//缓存失效时间（时间戳格式）
|
|
||||||
}
|
|
||||||
},
|
|
||||||
fail: e => {
|
|
||||||
checkError(e, reject)
|
|
||||||
},
|
|
||||||
complete: () => {}
|
|
||||||
})
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -73,28 +73,13 @@
|
||||||
lang: 'zh_CN',
|
lang: 'zh_CN',
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
_this.userInfo = res.userInfo;
|
_this.userInfo = res.userInfo;
|
||||||
// console.log(_this.userInfo);
|
|
||||||
// var userInfo = res.userInfo
|
|
||||||
// var nickName = userInfo.nickName
|
|
||||||
var avatarUrl = _this.userInfo.avatarUrl
|
var avatarUrl = _this.userInfo.avatarUrl
|
||||||
uni.setStorageSync('logoImg',avatarUrl)
|
uni.setStorageSync('logoImg',avatarUrl)
|
||||||
// var gender = userInfo.gender //性别 0：未知、1：男、2：女
|
|
||||||
// var province = userInfo.province
|
|
||||||
// var city = userInfo.city
|
|
||||||
// var country = userInfo.country
|
|
||||||
// console.log('用户信息：' + userInfo);
|
|
||||||
// console.log('用户昵称：' + nickName);
|
|
||||||
// console.log('用户头像：' + avatarUrl);
|
|
||||||
// console.log('用户所在省：' + province);
|
|
||||||
// console.log('用户所在城市：' + city);
|
|
||||||
// console.log('用户所在国家：' + country);
|
|
||||||
try {
|
try {
|
||||||
_this.login();
|
_this.login();
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
},
|
},
|
||||||
fail: (res) => {
|
fail: (res) => {}
|
||||||
// console.log(res)
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
//旧版登录方式
|
//旧版登录方式
|
||||||
|
|
@ -158,6 +143,7 @@
|
||||||
uni.setStorageSync('openid',res.data.openid)//缓存Openid
|
uni.setStorageSync('openid',res.data.openid)//缓存Openid
|
||||||
uni.setStorageSync('expire',res.data.expire)//缓存失效时间（时间戳格式）
|
uni.setStorageSync('expire',res.data.expire)//缓存失效时间（时间戳格式）
|
||||||
uni.setStorageSync('is_active',res.data.is_active)//是否第一次授权
|
uni.setStorageSync('is_active',res.data.is_active)//是否第一次授权
|
||||||
|
uni.setStorageSync('user_type',res.data.user_type)//权限
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url:'/pages/tabbar/homePage/homePage'
|
url:'/pages/tabbar/homePage/homePage'
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="disaa padding-zy20" style="margin-top: -10rpx;">
|
<view v-if="user_type!='personal'" class="disaa padding-zy20" style="margin-top: -10rpx;">
|
||||||
<!-- 我的收藏 -->
|
<!-- 我的收藏 -->
|
||||||
<view class="discc" @tap="ziliao(0)">
|
<view class="discc" @tap="ziliao(0)">
|
||||||
<view class="colorb fon36 bold">{{allCollection}}</view>
|
<view class="colorb fon36 bold">{{allCollection}}</view>
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<view class="margin20">
|
<view class="margin20">
|
||||||
<!-- 收益 -->
|
<!-- 收益 -->
|
||||||
<view class="disaa colorb padding-sx20 "
|
<view v-if="user_type!='personal'" class="disaa colorb padding-sx20 "
|
||||||
style="background-color: #293140;border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;">
|
style="background-color: #293140;border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;">
|
||||||
<view @tap="goShouy(indexs)" class="discc flexs" v-for="(item,indexs) in shouArr" :key="indexs"
|
<view @tap="goShouy(indexs)" class="discc flexs" v-for="(item,indexs) in shouArr" :key="indexs"
|
||||||
style="width: 25%;">
|
style="width: 25%;">
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 提现类 -->
|
<!-- 提现类 -->
|
||||||
<view class="disaa padding-sx20 bacb"
|
<view v-if="user_type!='personal'" class="disaa padding-sx20 bacb"
|
||||||
style="border-bottom-left-radius: 10rpx;border-bottom-right-radius: 10rpx;">
|
style="border-bottom-left-radius: 10rpx;border-bottom-right-radius: 10rpx;">
|
||||||
<view @tap="clickt(indext)" class="discc flexs" v-for="(item,indext) in tiArr" :key="indext"
|
<view @tap="clickt(indext)" class="discc flexs" v-for="(item,indext) in tiArr" :key="indext"
|
||||||
style="width: 25%;">
|
style="width: 25%;">
|
||||||
|
|
@ -78,7 +78,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 我的订单 -->
|
<!-- 我的订单 -->
|
||||||
<view class="margin20 bacb radius10">
|
<view v-if="user_type!='personal'" class="margin20 bacb radius10">
|
||||||
<view class="disba padding20 margin-zy10">
|
<view class="disba padding20 margin-zy10">
|
||||||
<view class="fon32 bold">我的订单</view>
|
<view class="fon32 bold">我的订单</view>
|
||||||
<view class="disac" @tap="checkAll">
|
<view class="disac" @tap="checkAll">
|
||||||
|
|
@ -227,7 +227,8 @@
|
||||||
isfocus:false,
|
isfocus:false,
|
||||||
xtitle:'',
|
xtitle:'',
|
||||||
drawRule:[],
|
drawRule:[],
|
||||||
isGui:false
|
isGui:false,
|
||||||
|
user_type:uni.getStorageSync('user_type')//权限
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
|
|
@ -255,6 +256,12 @@
|
||||||
this.isInput = false
|
this.isInput = false
|
||||||
this.inputVal = ''
|
this.inputVal = ''
|
||||||
}
|
}
|
||||||
|
if(this.user_type=='personal'){
|
||||||
|
this.useArr = [
|
||||||
|
{src: '/static/img/public/shoucactive.png',title: '收藏'},
|
||||||
|
{src: '/static/img/my/hez.png',title: '商务合作'},
|
||||||
|
]
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
zhuan(index){//调起转换分红收益弹框
|
zhuan(index){//调起转换分红收益弹框
|
||||||
|
|
@ -706,6 +713,10 @@
|
||||||
},
|
},
|
||||||
goUtils(index) {
|
goUtils(index) {
|
||||||
// console.log('常用工具：' + index);
|
// console.log('常用工具：' + index);
|
||||||
|
if(this.user_type=='personal'){
|
||||||
|
if(index==0) uni.navigateTo({url:'/pagesB/myCollection/myCollection'})
|
||||||
|
if(index==1) uni.navigateTo({url:'/pagesB/businessCooperation/businessCooperation'})
|
||||||
|
} else {
|
||||||
switch (index) {
|
switch (index) {
|
||||||
case 0:
|
case 0:
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
@ -730,6 +741,7 @@
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
closema() {
|
closema() {
|
||||||
this.isMa = this.showScan = false
|
this.isMa = this.showScan = false
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
<view class="disba margin-s20">
|
<view class="disba margin-s20">
|
||||||
<view class="colorf6 fon24 bold">￥<text class="fon28">{{item.price}}</text>.0</view>
|
<view class="colorf6 fon24 bold">￥<text class="fon28">{{item.price}}</text>.0</view>
|
||||||
<!-- 加入购物车图片 -->
|
<!-- 加入购物车图片 -->
|
||||||
<image @tap.stop="addGou(item.id)" class="progc" src="/static/img/public/gouwcar.png"></image>
|
<image v-if="user_type!='personal'" @tap.stop="addGou(item.id)" class="progc" src="/static/img/public/gouwcar.png"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -53,16 +53,30 @@
|
||||||
<!-- 筛选弹框，关闭图片 -->
|
<!-- 筛选弹框，关闭图片 -->
|
||||||
<image @tap="closeCate" class="margin-y20" style="width: 28rpx;height: 28rpx;" src="/static/img/product/pclose.png" mode=""></image>
|
<image @tap="closeCate" class="margin-y20" style="width: 28rpx;height: 28rpx;" src="/static/img/product/pclose.png" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
<view style="background-color: #f5f5f5;height: 100%;">
|
<view class="dis" style="height: 100%;">
|
||||||
|
<scroll-view v-if="shaiArrt.length!=0" scroll-y style="background-color: #FFFFFF;height: 100%;">
|
||||||
|
<view>
|
||||||
|
<view @tap="checkShait(item.id,indexs)"
|
||||||
|
:class="shaiCurrentt==indexs?'dangShait colorb':'xbort color6'"
|
||||||
|
class="fon24 disac shaiEnd" v-for="(item,indexs) in shaiArrt"
|
||||||
|
:key="indexs" style="padding: 30rpx;">
|
||||||
|
<view class="flexs ">{{item.name}}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</scroll-view>
|
||||||
|
<scroll-view scroll-y style="background-color: #f5f5f5;height: 100%;">
|
||||||
|
<view>
|
||||||
<view @tap="checkShai(item.id,indexs)"
|
<view @tap="checkShai(item.id,indexs)"
|
||||||
:class="shaiCurrent==indexs?'dangShai':''"
|
:class="shaiCurrent==indexs?'dangShai':''"
|
||||||
class="fon24 disac" v-for="(item,indexs) in shaiArr"
|
class="fon24 disac shaiEnd" v-for="(item,indexs) in shaiArr"
|
||||||
:key="indexs" style="padding: 30rpx;">
|
:key="indexs" style="padding: 30rpx;">
|
||||||
<view>{{item.name}}</view>
|
<view class="flexs">{{item.name}}</view>
|
||||||
<!-- 筛选弹框，右侧图片 -->
|
<!-- 筛选弹框，右侧图片 -->
|
||||||
<image v-if="shaiCurrent==indexs" class="posia" style="right: 0;width: 4rpx;height: 49rpx;" src="/static/img/product/pyxian.png" mode=""></image>
|
<image v-if="shaiCurrent==indexs" class="posia" style="right: 0;width: 4rpx;height: 49rpx;" src="/static/img/product/pyxian.png" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</scroll-view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<backTop :showTop="showTop" @backTop="backTop"></backTop>
|
<backTop :showTop="showTop" @backTop="backTop"></backTop>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -82,7 +96,9 @@
|
||||||
productList:[],
|
productList:[],
|
||||||
zanList:[],//暂存产品列表不显示
|
zanList:[],//暂存产品列表不显示
|
||||||
shaiArr:[],
|
shaiArr:[],
|
||||||
|
shaiArrt:[],
|
||||||
shaiCurrent:0,
|
shaiCurrent:0,
|
||||||
|
shaiCurrentt:'-1',
|
||||||
isShai:false,
|
isShai:false,
|
||||||
yin:false,
|
yin:false,
|
||||||
chuout:'',
|
chuout:'',
|
||||||
|
|
@ -99,7 +115,8 @@
|
||||||
statusHNH:uni.getStorageSync('statusHNH'),
|
statusHNH:uni.getStorageSync('statusHNH'),
|
||||||
moIndex:0,
|
moIndex:0,
|
||||||
pageShow:false,
|
pageShow:false,
|
||||||
showJian:true
|
showJian:true,
|
||||||
|
user_type:uni.getStorageSync('user_type')//权限
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
|
@ -223,6 +240,8 @@
|
||||||
},
|
},
|
||||||
choose(index){//标题选择
|
choose(index){//标题选择
|
||||||
let ya = this
|
let ya = this
|
||||||
|
this.shaiCurrent = '-1'
|
||||||
|
this.shaiCurrentt = '-1'
|
||||||
this.cid = 0
|
this.cid = 0
|
||||||
this.page = 1
|
this.page = 1
|
||||||
this.size = 10
|
this.size = 10
|
||||||
|
|
@ -282,10 +301,22 @@
|
||||||
id:item.id,
|
id:item.id,
|
||||||
name:item.name,
|
name:item.name,
|
||||||
pid:item.pid,
|
pid:item.pid,
|
||||||
hasChildren:item.hasChildren
|
hasChildren:item.hasChildren,
|
||||||
|
children:item.children
|
||||||
}
|
}
|
||||||
this.shaiArr.push(obj)
|
this.shaiArr.push(obj)
|
||||||
})
|
})
|
||||||
|
if(this.shaiArr[0].children.length!=0 && this.shaiArr[0].children!=undefined){
|
||||||
|
this.shaiArr[0].children.forEach(item=>{
|
||||||
|
let obj = {
|
||||||
|
id:item.id,
|
||||||
|
name:item.name,
|
||||||
|
pid:item.pid,
|
||||||
|
hasChildren:item.hasChildren,
|
||||||
|
}
|
||||||
|
this.shaiArrt.push(obj)
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},error=>{})
|
},error=>{})
|
||||||
},
|
},
|
||||||
|
|
@ -325,10 +356,30 @@
|
||||||
url:'/pagesA/productDetail/productDetail?id='+id
|
url:'/pagesA/productDetail/productDetail?id='+id
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
checkShai(id,index){//筛选框item点击事件 按类别查询商品
|
checkShai(id,index){//筛选框item点击事件 按类别查询商品
|
||||||
// console.log(id,index);
|
// console.log(id,index);
|
||||||
this.shaiCurrent = index
|
this.shaiCurrent = index
|
||||||
|
this.shaiCurrentt = '-1'
|
||||||
|
if(id=='') this.cid = 0
|
||||||
|
else this.cid = id
|
||||||
|
this.page = 1
|
||||||
|
this.isZanw = true
|
||||||
|
this.checkList()
|
||||||
|
this.shaiArrt = []
|
||||||
|
if(this.shaiArr[index].hasChildren==true && this.shaiArr[index].children.length!=0){
|
||||||
|
this.shaiArr[index].children.forEach(item=>{
|
||||||
|
let obj = {
|
||||||
|
id:item.id,
|
||||||
|
name:item.name,
|
||||||
|
pid:item.pid,
|
||||||
|
hasChildren:item.hasChildren,
|
||||||
|
}
|
||||||
|
this.shaiArrt.push(obj)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
checkShait(id,index){
|
||||||
|
this.shaiCurrentt = index
|
||||||
if(id=='') this.cid = 0
|
if(id=='') this.cid = 0
|
||||||
else this.cid = id
|
else this.cid = id
|
||||||
this.page = 1
|
this.page = 1
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@
|
||||||
<!-- 喜欢列表 -->
|
<!-- 喜欢列表 -->
|
||||||
<twocoluList @addChe="addChe" :dataList="dataList"></twocoluList>
|
<twocoluList @addChe="addChe" :dataList="dataList"></twocoluList>
|
||||||
<!-- 结算 -->
|
<!-- 结算 -->
|
||||||
<view class="posi-bzy disba padding-zy20 gouwcb-box">
|
<view v-if="user_type!='personal'" class="posi-bzy disba padding-zy20 gouwcb-box">
|
||||||
<view class="disac">
|
<view class="disac">
|
||||||
<label class="radio disac" style="margin-top: -6rpx;">
|
<label class="radio disac" style="margin-top: -6rpx;">
|
||||||
<radio :checked="allcheck" @tap="allchoose" color="#ff7800"/><view class="margin-z10 margin-y20 margin-s10">全选</view>
|
<radio :checked="allcheck" @tap="allchoose" color="#ff7800"/><view class="margin-z10 margin-y20 margin-s10">全选</view>
|
||||||
|
|
@ -102,6 +102,7 @@
|
||||||
size:10,
|
size:10,
|
||||||
total:'',
|
total:'',
|
||||||
isZanw:true,
|
isZanw:true,
|
||||||
|
user_type:uni.getStorageSync('user_type')//权限
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 商品评价 -->
|
<!-- 商品评价 -->
|
||||||
<view class="margin-s20 bacb">
|
<view v-if="user_type!='personal'" class="margin-s20 bacb">
|
||||||
<view class="disba padding-sx20 padding-zy20">
|
<view class="disba padding-sx20 padding-zy20">
|
||||||
<view class="fon32 bold">商品评价({{evalTotal}})</view>
|
<view class="fon32 bold">商品评价({{evalTotal}})</view>
|
||||||
<view class="disac">
|
<view class="disac">
|
||||||
|
|
@ -123,7 +123,8 @@
|
||||||
pageShow:false,
|
pageShow:false,
|
||||||
titleVal:'',
|
titleVal:'',
|
||||||
xiaj:false,//是否下架
|
xiaj:false,//是否下架
|
||||||
showShare:true
|
showShare:true,
|
||||||
|
user_type:uni.getStorageSync('user_type')//权限
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onPageScroll(e) {
|
onPageScroll(e) {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -142,21 +142,9 @@ var _tools = _interopRequireDefault(__webpack_require__(/*! @/jsFile/tools.js */
|
||||||
|
|
||||||
},
|
},
|
||||||
onShow: function onShow() {
|
onShow: function onShow() {
|
||||||
// wx.checkSession({ //检测当前用户的session_key是否过期
|
setTimeout(function () {
|
||||||
// success: function() { //session_key 未过期，并且在本生命周期一直有效
|
|
||||||
// if(uni.getStorageSync('token')!=''){
|
|
||||||
_tools.default.tools.guoq();
|
_tools.default.tools.guoq();
|
||||||
// }
|
}, 3000);
|
||||||
// },fail() {
|
|
||||||
// toolAll.tools.showToast('您目前是游客，请授权登录')
|
|
||||||
// setTimeout(()=>{
|
|
||||||
// uni.navigateTo({
|
|
||||||
// url:'/pages/login/login'
|
|
||||||
// })
|
|
||||||
// },1000)
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
console.log('App Show');
|
|
||||||
},
|
},
|
||||||
onHide: function onHide() {
|
onHide: function onHide() {
|
||||||
// console.log('App Hide');
|
// console.log('App Hide');
|
||||||
|
|
|
||||||
|
|
@ -34,18 +34,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -205,6 +193,8 @@
|
||||||
.borbot{border-bottom: 1rpx solid rgba(240,240,240,.9);}
|
.borbot{border-bottom: 1rpx solid rgba(240,240,240,.9);}
|
||||||
.borbot:last-child{border-bottom: none;}
|
.borbot:last-child{border-bottom: none;}
|
||||||
.dangShai{background-color: #e4ebf7;font-size: 28rpx;font-weight: bold;}
|
.dangShai{background-color: #e4ebf7;font-size: 28rpx;font-weight: bold;}
|
||||||
|
.dangShait{background-color: #f5f5f5;font-size: 28rpx;font-weight: bold;}
|
||||||
|
.xbort{border-bottom: 1rpx solid #f1f1f1;}
|
||||||
.progc{width: 54rpx;height: 54rpx;}
|
.progc{width: 54rpx;height: 54rpx;}
|
||||||
.catebold{color: #1c4594;font-weight: bold;}
|
.catebold{color: #1c4594;font-weight: bold;}
|
||||||
/* 购物车 */
|
/* 购物车 */
|
||||||
|
|
@ -274,7 +264,10 @@ button:after{content: none!important;}
|
||||||
.ptab{position: fixed;left: 0;right: 0;padding: 0 20rpx 20rpx 20rpx;}
|
.ptab{position: fixed;left: 0;right: 0;padding: 0 20rpx 20rpx 20rpx;}
|
||||||
.plist{margin-top: 210rpx;margin-bottom: 20rpx;}
|
.plist{margin-top: 210rpx;margin-bottom: 20rpx;}
|
||||||
.searchlist{margin-bottom: 20rpx;}
|
.searchlist{margin-bottom: 20rpx;}
|
||||||
.pchoose{position: fixed;right: 0;bottom: 0;width: 180rpx;}
|
.pchoose{position: fixed;right: 0;bottom: 0;min-width: 200rpx;z-index: 6;}
|
||||||
|
.shaiEnd:last-child{
|
||||||
|
margin-bottom: 120rpx;
|
||||||
|
}
|
||||||
.switch-qiu{margin-top: 4rpx;}
|
.switch-qiu{margin-top: 4rpx;}
|
||||||
.tan-box{position: fixed;top: 50%;left: 50%;-webkit-transform: translate(-50%,-50%);transform: translate(-50%,-50%);z-index: 101;border-radius: 30rpx;background-color: #FFFFFF;}
|
.tan-box{position: fixed;top: 50%;left: 50%;-webkit-transform: translate(-50%,-50%);transform: translate(-50%,-50%);z-index: 101;border-radius: 30rpx;background-color: #FFFFFF;}
|
||||||
.orderRight{position: absolute;right: 10rpx;text-align: right;}
|
.orderRight{position: absolute;right: 10rpx;text-align: right;}
|
||||||
|
|
|
||||||
|
|
@ -282,10 +282,14 @@ var promiseInterceptor = {
|
||||||
if (!isPromise(res)) {
|
if (!isPromise(res)) {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
return res.then(function (res) {
|
return new Promise(function (resolve, reject) {
|
||||||
return res[1];
|
res.then(function (res) {
|
||||||
}).catch(function (res) {
|
if (res[0]) {
|
||||||
return res[0];
|
reject(res[0]);
|
||||||
|
} else {
|
||||||
|
resolve(res[1]);
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
} };
|
} };
|
||||||
|
|
||||||
|
|
@ -872,7 +876,7 @@ function initData(vueOptions, context) {
|
||||||
try {
|
try {
|
||||||
data = data.call(context); // 支持 Vue.prototype 上挂的数据
|
data = data.call(context); // 支持 Vue.prototype 上挂的数据
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (Object({"VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
if (Object({"NODE_ENV":"development","VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
||||||
console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
|
console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -7372,7 +7376,7 @@ function initProps (vm, propsOptions) {
|
||||||
defineReactive$$1(props, key, value, function () {
|
defineReactive$$1(props, key, value, function () {
|
||||||
if (!isRoot && !isUpdatingChildComponent) {
|
if (!isRoot && !isUpdatingChildComponent) {
|
||||||
{
|
{
|
||||||
if(vm.mpHost === 'mp-baidu'){//百度 observer 在 setData callback 之后触发，直接忽略该 warn
|
if(vm.mpHost === 'mp-baidu' || vm.mpHost === 'mp-kuaishou'){//百度、快手 observer 在 setData callback 之后触发，直接忽略该 warn
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
//fixed by xxxxxx __next_tick_pending,uni://form-field 时不告警
|
//fixed by xxxxxx __next_tick_pending,uni://form-field 时不告警
|
||||||
|
|
@ -8279,7 +8283,7 @@ function type(obj) {
|
||||||
|
|
||||||
function flushCallbacks$1(vm) {
|
function flushCallbacks$1(vm) {
|
||||||
if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
|
if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
|
||||||
if (Object({"VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
if (Object({"NODE_ENV":"development","VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
||||||
var mpInstance = vm.$scope;
|
var mpInstance = vm.$scope;
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
||||||
']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
|
']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
|
||||||
|
|
@ -8300,14 +8304,14 @@ function nextTick$1(vm, cb) {
|
||||||
//1.nextTick 之前 已 setData 且 setData 还未回调完成
|
//1.nextTick 之前 已 setData 且 setData 还未回调完成
|
||||||
//2.nextTick 之前存在 render watcher
|
//2.nextTick 之前存在 render watcher
|
||||||
if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
|
if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
|
||||||
if(Object({"VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
|
if(Object({"NODE_ENV":"development","VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
|
||||||
var mpInstance = vm.$scope;
|
var mpInstance = vm.$scope;
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
||||||
']:nextVueTick');
|
']:nextVueTick');
|
||||||
}
|
}
|
||||||
return nextTick(cb, vm)
|
return nextTick(cb, vm)
|
||||||
}else{
|
}else{
|
||||||
if(Object({"VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
|
if(Object({"NODE_ENV":"development","VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
|
||||||
var mpInstance$1 = vm.$scope;
|
var mpInstance$1 = vm.$scope;
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
|
||||||
']:nextMPTick');
|
']:nextMPTick');
|
||||||
|
|
@ -8393,7 +8397,7 @@ var patch = function(oldVnode, vnode) {
|
||||||
});
|
});
|
||||||
var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
|
var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
|
||||||
if (Object.keys(diffData).length) {
|
if (Object.keys(diffData).length) {
|
||||||
if (Object({"VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
if (Object({"NODE_ENV":"development","VUE_APP_NAME":"dengrui","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
|
||||||
']差量更新',
|
']差量更新',
|
||||||
JSON.stringify(diffData));
|
JSON.stringify(diffData));
|
||||||
|
|
@ -10951,24 +10955,6 @@ var _default = QRCode;exports.default = _default;
|
||||||
// console.log(time2);//1398250549123
|
// console.log(time2);//1398250549123
|
||||||
// console.log(time3);//1398250549000
|
// console.log(time3);//1398250549000
|
||||||
},
|
},
|
||||||
isShouq: function isShouq() {
|
|
||||||
return false;
|
|
||||||
wx.checkSession({ //检测当前用户的session_key是否过期
|
|
||||||
success: function success() {//session_key 未过期，并且在本生命周期一直有效
|
|
||||||
this.guoq();
|
|
||||||
}, fail: function fail() {
|
|
||||||
uni.showToast({
|
|
||||||
title: '您目前是游客，请授权登录',
|
|
||||||
icon: 'none' });
|
|
||||||
|
|
||||||
setTimeout(function () {
|
|
||||||
uni.navigateTo({
|
|
||||||
url: '/pages/login/login' });
|
|
||||||
|
|
||||||
}, 1500);
|
|
||||||
} });
|
|
||||||
|
|
||||||
},
|
|
||||||
guoq: function guoq() {
|
guoq: function guoq() {
|
||||||
var date = new Date();
|
var date = new Date();
|
||||||
var timestamp = date.getTime(); //精确到毫秒
|
var timestamp = date.getTime(); //精确到毫秒
|
||||||
|
|
@ -10976,7 +10962,7 @@ var _default = QRCode;exports.default = _default;
|
||||||
this.loginEv();
|
this.loginEv();
|
||||||
} else if (uni.getStorageSync('token') == '') {
|
} else if (uni.getStorageSync('token') == '') {
|
||||||
this.loginEv();
|
this.loginEv();
|
||||||
} else {
|
} else if (uni.getStorageSync('is_active') == '' || uni.getStorageSync('is_active') == 0) {
|
||||||
this.loginEv();
|
this.loginEv();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -11013,6 +10999,7 @@ var _default = QRCode;exports.default = _default;
|
||||||
uni.setStorageSync('openid', res.data.data.openid); //缓存Openid
|
uni.setStorageSync('openid', res.data.data.openid); //缓存Openid
|
||||||
uni.setStorageSync('expire', res.data.data.expire); //缓存失效时间（时间戳格式）
|
uni.setStorageSync('expire', res.data.data.expire); //缓存失效时间（时间戳格式）
|
||||||
uni.setStorageSync('is_active', res.data.data.is_active); //是否第一次授权
|
uni.setStorageSync('is_active', res.data.data.is_active); //是否第一次授权
|
||||||
|
uni.setStorageSync('user_type', res.data.data.user_type); //权限
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fail: function fail(e) {
|
fail: function fail(e) {
|
||||||
|
|
@ -11107,42 +11094,6 @@ var _default = QRCode;exports.default = _default;
|
||||||
}, time);
|
}, time);
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
|
||||||
checkGuo: function checkGuo() {
|
|
||||||
var invalidTime = uni.getStorageSync('expire'); //获取过期时间戳
|
|
||||||
var dangTime = Math.round(new Date() / 1000); //获取当前时间戳
|
|
||||||
// if(invalidTime==''){//当前时间戳减过期时间戳大于零，就表示已过期
|
|
||||||
// uni.showToast({title:'您当前是游客，请授权登录',icon:'none',duration:2000})
|
|
||||||
// setTimeout(function(){
|
|
||||||
// uni.reLaunch({url:'/pages/login/login'})//跳转到授权登录页
|
|
||||||
// },2000)
|
|
||||||
// }
|
|
||||||
// console.log('dangTime-invalidTime:',(dangTime-invalidTime));
|
|
||||||
// if(dangTime-invalidTime>=0){
|
|
||||||
uni.request({
|
|
||||||
url: "https://dengrui.scdxtc.cn/api/user/wxAppletsLogin",
|
|
||||||
method: 'post',
|
|
||||||
data: uni.getStorageSync('params'),
|
|
||||||
header: {
|
|
||||||
'Content-Type': 'application/json; charset=UTF-8',
|
|
||||||
// "content-type": "application/x-www-form-urlencoded;charset=UTF-8",
|
|
||||||
'Authorization': 'Bearer ' + uni.getStorageSync('token') || false },
|
|
||||||
|
|
||||||
success: function success(res) {
|
|
||||||
console.log(res);
|
|
||||||
console.log('token:', uni.getStorageSync('token'));
|
|
||||||
if (res.data.token != '') {
|
|
||||||
uni.setStorageSync('token', res.data.token); //缓存token
|
|
||||||
uni.setStorageSync('openid', res.data.openid); //缓存Openid
|
|
||||||
uni.setStorageSync('expire', res.data.expire); //缓存失效时间（时间戳格式）
|
|
||||||
}
|
|
||||||
},
|
|
||||||
fail: function fail(e) {
|
|
||||||
checkError(e, reject);
|
|
||||||
},
|
|
||||||
complete: function complete() {} });
|
|
||||||
|
|
||||||
// }
|
|
||||||
} };var _default =
|
} };var _default =
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -207,8 +207,9 @@ var _default2 =
|
||||||
sku_id: '',
|
sku_id: '',
|
||||||
srcImg: '',
|
srcImg: '',
|
||||||
orderList: [],
|
orderList: [],
|
||||||
showKf: true };
|
showKf: true,
|
||||||
|
user_type: uni.getStorageSync('user_type') //权限
|
||||||
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
sku_img: function sku_img(newImg, oldImg) {
|
sku_img: function sku_img(newImg, oldImg) {
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<view><view class="bacb disba padding20 posi-bzy" style="border-top:1rpx solid #eeeeee;"><view class="disba" style="width:24%;"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="discc margin-z20" bindtap="__e"><image class="bottosimg" src="/static/img/public/home.png" mode></image><view class="fon24 bottoc">首页</view></view><view data-event-opts="{{[['tap',[['goKef',['$event']]]]]}}" class="discc posir" bindtap="__e"><image class="bottokimg" src="/static/img/public/xkef.png" mode></image><view class="fon24 bottoc">客服</view><block wx:if="{{showKf}}"><button class="fon24 bottoc posia" style="opacity:0;" open-type="contact" bindcontact="huik">客服</button></block></view></view><view class="disac"><view data-event-opts="{{[['tap',[['diaoq',['$event']]]]]}}" class="margin-y20 textc bottoj" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['diaoq',['$event']]]]]}}" class="textc bottol" bindtap="__e">立即购买</view></view></view><block wx:if="{{isBtn}}"><view data-event-opts="{{[['touchmove',[['moveHandle',['$event']]]]]}}" class="posiall zIn5" style="background-color:rgba(0,0,0,.6);" catchtouchmove="__e"><view class="posi-bzy padding20" style="border-top-left-radius:30rpx;border-top-right-radius:30rpx;background-color:#FFFFFF;z-index:6;"><view class="margin-s20 dis"><image class="flexs" style="width:201rpx;height:201rpx;border-radius:10rpx;" src="{{srcImg}}"></image><view class="margin-z20 width100"><view class="colorf6 fon24 bold">￥<text class="fon28">{{detail.sku_list[sku_index].cur_price/100}}</text>.0</view><view class="fon28 color33">{{detail.name}}</view></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" style="flex-shrink:0;width:38rpx;height:38rpx;border-radius:100%;background-color:rgba(0,0,0,.15);position:relative;display:flex;justify-content:center;align-items:center;top:-10rpx;" bindtap="__e"><view style="width:2rpx;height:20rpx;background-color:#666666;position:absolute;transform:rotate(45deg);"></view><view style="width:2rpx;height:20rpx;background-color:#666666;position:absolute;transform:rotate(-45deg);"></view></view></view><view class="bold color33 margin-s30" style="font-size:30rpx;">规格选择</view><view class="disac flw"><block wx:for="{{guigArr}}" wx:for-item="item" wx:for-index="indexg" wx:key="indexg"><view data-event-opts="{{[['tap',[['chooseguig',['$0',indexg],[[['guigArr','',indexg,'id']]]]]]]}}" class="{{['fon24','margin-s20','margin-y10','padding-sx10','padding-zy30',guigCurrent==indexg?'guigactive':'guigmo']}}" style="background-color:#f3f3f3;border-radius:30rpx;min-width:60rpx;text-align:center;max-width:100%;" bindtap="__e"><view class="clips1">{{item.title}}</view></view></block></view><view class="borbot margin-x20 margin-s30"></view><view class="disba"><view class="width100">数量</view><view class="disac" style="justify-content:flex-end;"><view data-event-opts="{{[['tap',[['delEvent',[0]]]]]}}" class="disbcac padding-sx30" bindtap="__e"><image class="margin-y20" style="width:18rpx;height:4rpx;" src="../static/img/product/del.png"></image></view><input style="width:40%;background-color:#F5F5F5;text-align:center;padding:4rpx 0;border-radius:4rpx;" type="text" disabled="{{true}}" data-event-opts="{{[['input',[['__set_model',['','num','$event',[]]]]]]}}" value="{{num}}" bindinput="__e"/><view data-event-opts="{{[['tap',[['addEvent',[1]]]]]}}" class="disbcac padding-sx30" bindtap="__e"><image class="margin-zy20" style="width:18rpx;height:18rpx;" src="../static/img/product/add.png"></image></view></view></view><view class="disbcac padding-sx40"><view data-event-opts="{{[['tap',[['addGowc',['$event']]]]]}}" class="bold padding-sx20 padding-zy40 colorf78 margin-y10" style="font-size:30rpx;border:1rpx solid #FF7800;border-radius:60rpx;width:30%;text-align:center;" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['buy',['$event']]]]]}}" class="bold padding-sx20 padding-zy40 colorb margin-z20" style="font-size:30rpx;background-color:#ff7800;border-radius:60rpx;width:30%;text-align:center;" bindtap="__e">立即购买</view></view></view></view></block></view>
|
<view><view class="bacb disba padding20 posi-bzy" style="border-top:1rpx solid #eeeeee;"><view class="disba" style="width:24%;"><view data-event-opts="{{[['tap',[['goHome',['$event']]]]]}}" class="discc margin-z20" bindtap="__e"><image class="bottosimg" src="/static/img/public/home.png" mode></image><view class="fon24 bottoc">首页</view></view><view data-event-opts="{{[['tap',[['goKef',['$event']]]]]}}" class="discc posir" bindtap="__e"><image class="bottokimg" src="/static/img/public/xkef.png" mode></image><view class="fon24 bottoc">客服</view><block wx:if="{{showKf}}"><button class="fon24 bottoc posia" style="opacity:0;" open-type="contact" bindcontact="huik">客服</button></block></view></view><block wx:if="{{user_type!='personal'}}"><view class="disac"><view data-event-opts="{{[['tap',[['diaoq',['$event']]]]]}}" class="margin-y20 textc bottoj" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['diaoq',['$event']]]]]}}" class="textc bottol" bindtap="__e">立即购买</view></view></block></view><block wx:if="{{isBtn}}"><view data-event-opts="{{[['touchmove',[['moveHandle',['$event']]]]]}}" class="posiall zIn5" style="background-color:rgba(0,0,0,.6);" catchtouchmove="__e"><view class="posi-bzy padding20" style="border-top-left-radius:30rpx;border-top-right-radius:30rpx;background-color:#FFFFFF;z-index:6;"><view class="margin-s20 dis"><image class="flexs" style="width:201rpx;height:201rpx;border-radius:10rpx;" src="{{srcImg}}"></image><view class="margin-z20 width100"><view class="colorf6 fon24 bold">￥<text class="fon28">{{detail.sku_list[sku_index].cur_price/100}}</text>.0</view><view class="fon28 color33">{{detail.name}}</view></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" style="flex-shrink:0;width:38rpx;height:38rpx;border-radius:100%;background-color:rgba(0,0,0,.15);position:relative;display:flex;justify-content:center;align-items:center;top:-10rpx;" bindtap="__e"><view style="width:2rpx;height:20rpx;background-color:#666666;position:absolute;transform:rotate(45deg);"></view><view style="width:2rpx;height:20rpx;background-color:#666666;position:absolute;transform:rotate(-45deg);"></view></view></view><view class="bold color33 margin-s30" style="font-size:30rpx;">规格选择</view><view class="disac flw"><block wx:for="{{guigArr}}" wx:for-item="item" wx:for-index="indexg" wx:key="indexg"><view data-event-opts="{{[['tap',[['chooseguig',['$0',indexg],[[['guigArr','',indexg,'id']]]]]]]}}" class="{{['fon24','margin-s20','margin-y10','padding-sx10','padding-zy30',guigCurrent==indexg?'guigactive':'guigmo']}}" style="background-color:#f3f3f3;border-radius:30rpx;min-width:60rpx;text-align:center;max-width:100%;" bindtap="__e"><view class="clips1">{{item.title}}</view></view></block></view><view class="borbot margin-x20 margin-s30"></view><view class="disba"><view class="width100">数量</view><view class="disac" style="justify-content:flex-end;"><view data-event-opts="{{[['tap',[['delEvent',[0]]]]]}}" class="disbcac padding-sx30" bindtap="__e"><image class="margin-y20" style="width:18rpx;height:4rpx;" src="../static/img/product/del.png"></image></view><input style="width:40%;background-color:#F5F5F5;text-align:center;padding:4rpx 0;border-radius:4rpx;" type="text" disabled="{{true}}" data-event-opts="{{[['input',[['__set_model',['','num','$event',[]]]]]]}}" value="{{num}}" bindinput="__e"/><view data-event-opts="{{[['tap',[['addEvent',[1]]]]]}}" class="disbcac padding-sx30" bindtap="__e"><image class="margin-zy20" style="width:18rpx;height:18rpx;" src="../static/img/product/add.png"></image></view></view></view><view class="disbcac padding-sx40"><view data-event-opts="{{[['tap',[['addGowc',['$event']]]]]}}" class="bold padding-sx20 padding-zy40 colorf78 margin-y10" style="font-size:30rpx;border:1rpx solid #FF7800;border-radius:60rpx;width:30%;text-align:center;" bindtap="__e">加入购物车</view><view data-event-opts="{{[['tap',[['buy',['$event']]]]]}}" class="bold padding-sx20 padding-zy40 colorb margin-z20" style="font-size:30rpx;background-color:#ff7800;border-radius:60rpx;width:30%;text-align:center;" bindtap="__e">立即购买</view></view></view></view></block></view>
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
line-height: normal;
|
line-height: normal;
|
||||||
padding-right: 30rpx;
|
padding-right: 30rpx;
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
.lotus-address-picker-box {
|
.lotus-address-picker-box {
|
||||||
|
|
@ -35,7 +34,6 @@
|
||||||
width: 33.333%;
|
width: 33.333%;
|
||||||
padding-left: 20rpx;
|
padding-left: 20rpx;
|
||||||
padding-right: 20rpx;
|
padding-right: 20rpx;
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
.lotus-address-picker2 {
|
.lotus-address-picker2 {
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@
|
||||||
-webkit-box-align: center;
|
-webkit-box-align: center;
|
||||||
-webkit-align-items: center;
|
-webkit-align-items: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
|
|
@ -68,7 +67,6 @@
|
||||||
-webkit-box-align: center;
|
-webkit-box-align: center;
|
||||||
-webkit-align-items: center;
|
-webkit-align-items: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
-webkit-box-pack: center;
|
-webkit-box-pack: center;
|
||||||
-webkit-justify-content: center;
|
-webkit-justify-content: center;
|
||||||
|
|
|
||||||
|
|
@ -143,9 +143,9 @@ var _default2 =
|
||||||
|
|
||||||
|
|
||||||
data: function data() {
|
data: function data() {
|
||||||
return {};
|
return {
|
||||||
|
user_type: uni.getStorageSync('user_type') //权限
|
||||||
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
addChe: function addChe(id) {var _this = this; //加入购物车事件
|
addChe: function addChe(id) {var _this = this; //加入购物车事件
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<view class="padding-zy20 disba flw"><block wx:for="{{dataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{dataList.length!=0}}"><view class="discc radius10 padding20 margin-x20" style="background-color:#FFFFFF;width:43%;box-shadow:0 0 30rpx rgba(0,0,0,0.1);"><image class="pimg radius10 margin-s10" src="{{item.src}}" mode="aspectFill" data-event-opts="{{[['tap',[['goDetail',['$0'],[[['dataList','',index,'spu_id']]]]]]]}}" bindtap="__e"></image><view class="clips2 margin-s10 width100" style="font-size:27rpx;height:68rpx;text-align:left;">{{item.title}}</view><view class="disba width100 margin-sx10"><view class="disac fon24 colorf78"><view>￥<text class="fon36 bold">{{item.price}}</text>.00</view><view class="flexs radius16 colorb fon24 margin-z10" style="background-color:#4cc474;line-height:30rpx;height:30rpx;"><view style="transform:scale(0.7);margin-top:-1rpx;">放心购</view></view></view><image class="pche" src="/static/img/public/gouwcar.png" data-event-opts="{{[['tap',[['addChe',['$0'],[[['dataList','',index,'id']]]]]]]}}" bindtap="__e"></image></view></view></block></block><block wx:if="{{dataList.length==0}}"><view class="kongk width100 text-center">空空如也</view></block></view>
|
<view class="padding-zy20 disba flw"><block wx:for="{{dataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{dataList.length!=0}}"><view class="discc radius10 padding20 margin-x20" style="background-color:#FFFFFF;width:43%;box-shadow:0 0 30rpx rgba(0,0,0,0.1);"><image class="pimg radius10 margin-s10" src="{{item.src}}" mode="aspectFill" data-event-opts="{{[['tap',[['goDetail',['$0'],[[['dataList','',index,'spu_id']]]]]]]}}" bindtap="__e"></image><view class="clips2 margin-s10 width100" style="font-size:27rpx;height:68rpx;text-align:left;">{{item.title}}</view><view class="disba width100 margin-sx10"><view class="disac fon24 colorf78"><view>￥<text class="fon36 bold">{{item.price}}</text>.00</view><view class="flexs radius16 colorb fon24 margin-z10" style="background-color:#4cc474;line-height:30rpx;height:30rpx;"><view style="transform:scale(0.7);margin-top:-1rpx;">放心购</view></view></view><block wx:if="{{user_type!='personal'}}"><image class="pche" src="/static/img/public/gouwcar.png" data-event-opts="{{[['tap',[['addChe',['$0'],[[['dataList','',index,'id']]]]]]]}}" bindtap="__e"></image></block></view></view></block></block><block wx:if="{{dataList.length==0}}"><view class="kongk width100 text-center">空空如也</view></block></view>
|
||||||
|
|
@ -205,28 +205,13 @@ var _default =
|
||||||
lang: 'zh_CN',
|
lang: 'zh_CN',
|
||||||
success: function success(res) {
|
success: function success(res) {
|
||||||
_this.userInfo = res.userInfo;
|
_this.userInfo = res.userInfo;
|
||||||
// console.log(_this.userInfo);
|
|
||||||
// var userInfo = res.userInfo
|
|
||||||
// var nickName = userInfo.nickName
|
|
||||||
var avatarUrl = _this.userInfo.avatarUrl;
|
var avatarUrl = _this.userInfo.avatarUrl;
|
||||||
uni.setStorageSync('logoImg', avatarUrl);
|
uni.setStorageSync('logoImg', avatarUrl);
|
||||||
// var gender = userInfo.gender //性别 0：未知、1：男、2：女
|
|
||||||
// var province = userInfo.province
|
|
||||||
// var city = userInfo.city
|
|
||||||
// var country = userInfo.country
|
|
||||||
// console.log('用户信息：' + userInfo);
|
|
||||||
// console.log('用户昵称：' + nickName);
|
|
||||||
// console.log('用户头像：' + avatarUrl);
|
|
||||||
// console.log('用户所在省：' + province);
|
|
||||||
// console.log('用户所在城市：' + city);
|
|
||||||
// console.log('用户所在国家：' + country);
|
|
||||||
try {
|
try {
|
||||||
_this.login();
|
_this.login();
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
},
|
},
|
||||||
fail: function fail(res) {
|
fail: function fail(res) {} });
|
||||||
// console.log(res)
|
|
||||||
} });
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
//旧版登录方式
|
//旧版登录方式
|
||||||
|
|
@ -290,6 +275,7 @@ var _default =
|
||||||
uni.setStorageSync('openid', res.data.openid); //缓存Openid
|
uni.setStorageSync('openid', res.data.openid); //缓存Openid
|
||||||
uni.setStorageSync('expire', res.data.expire); //缓存失效时间（时间戳格式）
|
uni.setStorageSync('expire', res.data.expire); //缓存失效时间（时间戳格式）
|
||||||
uni.setStorageSync('is_active', res.data.is_active); //是否第一次授权
|
uni.setStorageSync('is_active', res.data.is_active); //是否第一次授权
|
||||||
|
uni.setStorageSync('user_type', res.data.user_type); //权限
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url: '/pages/tabbar/homePage/homePage' });
|
url: '/pages/tabbar/homePage/homePage' });
|
||||||
|
|
|
||||||
|
|
@ -364,8 +364,9 @@ var QRCode = __webpack_require__(/*! ../../../jsFile/qrcode.js */ 51).default;va
|
||||||
isfocus: false,
|
isfocus: false,
|
||||||
xtitle: '',
|
xtitle: '',
|
||||||
drawRule: [],
|
drawRule: [],
|
||||||
isGui: false };
|
isGui: false,
|
||||||
|
user_type: uni.getStorageSync('user_type') //权限
|
||||||
|
};
|
||||||
},
|
},
|
||||||
onLoad: function onLoad() {
|
onLoad: function onLoad() {
|
||||||
var res = uni.getSystemInfoSync();
|
var res = uni.getSystemInfoSync();
|
||||||
|
|
@ -385,7 +386,6 @@ var QRCode = __webpack_require__(/*! ../../../jsFile/qrcode.js */ 51).default;va
|
||||||
uni.navigateTo({ url: '/pages/login/login' });
|
uni.navigateTo({ url: '/pages/login/login' });
|
||||||
}, 1500);
|
}, 1500);
|
||||||
} else {
|
} else {
|
||||||
this.$toolAll.tools.isShouq();
|
|
||||||
// 查询收藏数量
|
// 查询收藏数量
|
||||||
this.checkCollection();
|
this.checkCollection();
|
||||||
this.userInfo(); //调用获取用户信息事件
|
this.userInfo(); //调用获取用户信息事件
|
||||||
|
|
@ -393,6 +393,12 @@ var QRCode = __webpack_require__(/*! ../../../jsFile/qrcode.js */ 51).default;va
|
||||||
this.isInput = false;
|
this.isInput = false;
|
||||||
this.inputVal = '';
|
this.inputVal = '';
|
||||||
}
|
}
|
||||||
|
if (this.user_type == 'personal') {
|
||||||
|
this.useArr = [
|
||||||
|
{ src: '/static/img/public/shoucactive.png', title: '收藏' },
|
||||||
|
{ src: '/static/img/my/hez.png', title: '商务合作' }];
|
||||||
|
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
zhuan: function zhuan(index) {//调起转换分红收益弹框
|
zhuan: function zhuan(index) {//调起转换分红收益弹框
|
||||||
|
|
@ -844,6 +850,10 @@ var QRCode = __webpack_require__(/*! ../../../jsFile/qrcode.js */ 51).default;va
|
||||||
},
|
},
|
||||||
goUtils: function goUtils(index) {
|
goUtils: function goUtils(index) {
|
||||||
// console.log('常用工具：' + index);
|
// console.log('常用工具：' + index);
|
||||||
|
if (this.user_type == 'personal') {
|
||||||
|
if (index == 0) uni.navigateTo({ url: '/pagesB/myCollection/myCollection' });
|
||||||
|
if (index == 1) uni.navigateTo({ url: '/pagesB/businessCooperation/businessCooperation' });
|
||||||
|
} else {
|
||||||
switch (index) {
|
switch (index) {
|
||||||
case 0:
|
case 0:
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
@ -868,6 +878,7 @@ var QRCode = __webpack_require__(/*! ../../../jsFile/qrcode.js */ 51).default;va
|
||||||
default:
|
default:
|
||||||
break;}
|
break;}
|
||||||
|
|
||||||
|
}
|
||||||
},
|
},
|
||||||
closema: function closema() {
|
closema: function closema() {
|
||||||
this.isMa = this.showScan = false;
|
this.isMa = this.showScan = false;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -187,6 +187,20 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -214,7 +228,9 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
productList: [],
|
productList: [],
|
||||||
zanList: [], //暂存产品列表不显示
|
zanList: [], //暂存产品列表不显示
|
||||||
shaiArr: [],
|
shaiArr: [],
|
||||||
|
shaiArrt: [],
|
||||||
shaiCurrent: 0,
|
shaiCurrent: 0,
|
||||||
|
shaiCurrentt: '-1',
|
||||||
isShai: false,
|
isShai: false,
|
||||||
yin: false,
|
yin: false,
|
||||||
chuout: '',
|
chuout: '',
|
||||||
|
|
@ -231,8 +247,9 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
statusHNH: uni.getStorageSync('statusHNH'),
|
statusHNH: uni.getStorageSync('statusHNH'),
|
||||||
moIndex: 0,
|
moIndex: 0,
|
||||||
pageShow: false,
|
pageShow: false,
|
||||||
showJian: true };
|
showJian: true,
|
||||||
|
user_type: uni.getStorageSync('user_type') //权限
|
||||||
|
};
|
||||||
},
|
},
|
||||||
onShow: function onShow() {
|
onShow: function onShow() {
|
||||||
this.$toolAll.tools.guoq();
|
this.$toolAll.tools.guoq();
|
||||||
|
|
@ -355,6 +372,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
},
|
},
|
||||||
choose: function choose(index) {//标题选择
|
choose: function choose(index) {//标题选择
|
||||||
var ya = this;
|
var ya = this;
|
||||||
|
this.shaiCurrent = '-1';
|
||||||
|
this.shaiCurrentt = '-1';
|
||||||
this.cid = 0;
|
this.cid = 0;
|
||||||
this.page = 1;
|
this.page = 1;
|
||||||
this.size = 10;
|
this.size = 10;
|
||||||
|
|
@ -414,10 +433,22 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
id: item.id,
|
id: item.id,
|
||||||
name: item.name,
|
name: item.name,
|
||||||
pid: item.pid,
|
pid: item.pid,
|
||||||
hasChildren: item.hasChildren };
|
hasChildren: item.hasChildren,
|
||||||
|
children: item.children };
|
||||||
|
|
||||||
_this3.shaiArr.push(obj);
|
_this3.shaiArr.push(obj);
|
||||||
});
|
});
|
||||||
|
if (_this3.shaiArr[0].children.length != 0 && _this3.shaiArr[0].children != undefined) {
|
||||||
|
_this3.shaiArr[0].children.forEach(function (item) {
|
||||||
|
var obj = {
|
||||||
|
id: item.id,
|
||||||
|
name: item.name,
|
||||||
|
pid: item.pid,
|
||||||
|
hasChildren: item.hasChildren };
|
||||||
|
|
||||||
|
_this3.shaiArrt.push(obj);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, function (error) {});
|
}, function (error) {});
|
||||||
},
|
},
|
||||||
|
|
@ -457,10 +488,30 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
url: '/pagesA/productDetail/productDetail?id=' + id });
|
url: '/pagesA/productDetail/productDetail?id=' + id });
|
||||||
|
|
||||||
},
|
},
|
||||||
|
checkShai: function checkShai(id, index) {var _this5 = this; //筛选框item点击事件 按类别查询商品
|
||||||
checkShai: function checkShai(id, index) {//筛选框item点击事件 按类别查询商品
|
|
||||||
// console.log(id,index);
|
// console.log(id,index);
|
||||||
this.shaiCurrent = index;
|
this.shaiCurrent = index;
|
||||||
|
this.shaiCurrentt = '-1';
|
||||||
|
if (id == '') this.cid = 0;else
|
||||||
|
this.cid = id;
|
||||||
|
this.page = 1;
|
||||||
|
this.isZanw = true;
|
||||||
|
this.checkList();
|
||||||
|
this.shaiArrt = [];
|
||||||
|
if (this.shaiArr[index].hasChildren == true && this.shaiArr[index].children.length != 0) {
|
||||||
|
this.shaiArr[index].children.forEach(function (item) {
|
||||||
|
var obj = {
|
||||||
|
id: item.id,
|
||||||
|
name: item.name,
|
||||||
|
pid: item.pid,
|
||||||
|
hasChildren: item.hasChildren };
|
||||||
|
|
||||||
|
_this5.shaiArrt.push(obj);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
checkShait: function checkShait(id, index) {
|
||||||
|
this.shaiCurrentt = index;
|
||||||
if (id == '') this.cid = 0;else
|
if (id == '') this.cid = 0;else
|
||||||
this.cid = id;
|
this.cid = id;
|
||||||
this.page = 1;
|
this.page = 1;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -231,8 +231,9 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
page: 1,
|
page: 1,
|
||||||
size: 10,
|
size: 10,
|
||||||
total: '',
|
total: '',
|
||||||
isZanw: true };
|
isZanw: true,
|
||||||
|
user_type: uni.getStorageSync('user_type') //权限
|
||||||
|
};
|
||||||
},
|
},
|
||||||
onShow: function onShow() {
|
onShow: function onShow() {
|
||||||
this.$toolAll.tools.guoq();
|
this.$toolAll.tools.guoq();
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<block wx:if="{{pageShow}}"><view><status-nav vue-id="d877afa2-1" statusBackw="{{true}}" whereCome="{{2}}" iscenter="{{true}}" statusTitleImg="{{true}}" statusTitle="{{true}}" title-val="购物车" tabcolor="#ffffff" bind:__l="__l"></status-nav><view style="{{'padding-top:'+(statusHNH+10+'px')+';'}}"><view class="padding-zy20 bacb"><block wx:for="{{gouwList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{gouwList.length!=0}}"><view class="{{['padding-sx30','disba','borbot','animated','',delCur==index?'fadeOutUp ':'']}}"><view class="disac"><view class="margin-y20"><label class="radio"><radio checked="{{item.status}}" color="#ff7800" data-event-opts="{{[['tap',[['choose',[index]]]]]}}" catchtap="__e"></radio></label></view><image class="radius10 gouwcimg" src="{{item.src}}" mode="aspectFill" data-event-opts="{{[['tap',[['checkDetail',['$0'],[[['gouwList','',index,'spu_id']]]]]]]}}" bindtap="__e"></image></view><view class="padding-z20"><view class="dis"><view class="clips2 fon28 color33 margin-y20 width100" style="line-height:46rpx;">{{item.title}}</view><image class="flexs margin-s10" style="width:30rpx;height:30rpx;" src="../../../static/img/gouwc/del.png" mode data-event-opts="{{[['tap',[['clear',['$0',index],[[['gouwList','',index,'id']]]]]]]}}" catchtap="__e"></image></view><view data-event-opts="{{[['tap',[['chooseCate',[index]]]]]}}" class="disbcac margin-s10 margin-x20 xuanz posir fon24 color9 " bindtap="__e"><view class="clips1">{{item.cateArr[0].sku_name}}</view><image class="margin-z20 flexs" style="width:17rpx;height:10rpx;" src="../../../static/img/gouwc/xia.png" mode></image><block wx:if="{{current==index}}"><view class="posia textc padding-x20" style="top:60rpx;left:0;right:0;background-color:rgb(245, 245, 245);border-radius:6rpx;"><scroll-view style="height:100rpx;" scroll-y="true"><view class="discc"><block wx:for="{{item.cateArr}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view data-event-opts="{{[['tap',[['cateChoose',[index,index1]]]]]}}" class="clips1 margin-s20" style="width:80%;" bindtap="__e">{{item1.sku_name}}</view></block></view></scroll-view></view></block></view><view class="margin-s30 disba"><view class="colorf6 fon24 bold width100">￥<text class="fon28">{{item.price}}</text>.0</view><view class="disac"><button class="deladd fon36 color33" disabled="{{item.num==1}}" data-event-opts="{{[['tap',[['deladdEvent',['$0',index,0],[[['gouwList','',index,'id']]]]]]]}}" catchtap="__e">-</button><input style="width:60%;background-color:#F5F5F5;text-align:center;padding:4rpx 0;border-radius:4rpx;" type="text" disabled="{{true}}" data-event-opts="{{[['input',[['__set_model',['$0','num','$event',[]],[[['gouwList','',index]]]]]]]}}" value="{{item.num}}" bindinput="__e"/><button data-event-opts="{{[['tap',[['deladdEvent',['$0',index,1],[[['gouwList','',index,'id']]]]]]]}}" class="deladd fon36 color33" catchtap="__e">+</button></view></view></view></view></block></block><block wx:if="{{gouwList.length==0}}"><view class="kongk">空空如也</view></block></view></view><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">猜你喜欢</view><view class="gouwcxian margin-z20"></view></view><twocolu-list vue-id="d877afa2-2" dataList="{{dataList}}" data-event-opts="{{[['^addChe',[['addChe']]]]}}" bind:addChe="__e" bind:__l="__l"></twocolu-list><view class="posi-bzy disba padding-zy20 gouwcb-box"><view class="disac"><label class="radio disac" style="margin-top:-6rpx;"><radio checked="{{allcheck}}" color="#ff7800" data-event-opts="{{[['tap',[['allchoose',['$event']]]]]}}" bindtap="__e"></radio><view class="margin-z10 margin-y20 margin-s10">全选</view></label><view class="fon36">合计:<label class="colorf6 bold">{{"￥"+allPrice+".0"}}</label></view></view><block wx:if="{{allNum!=0}}"><button class="colorb bold gouwcbtn" disabled="{{disb}}" data-event-opts="{{[['tap',[['gopay',['$event']]]]]}}" bindtap="__e">{{disb?'正在前往...':'去结算('+allNum+')'}}</button></block><block wx:else><button data-event-opts="{{[['tap',[['goGouw',['$event']]]]]}}" class="colorb bold gouwcbtn" bindtap="__e">去购物</button></block></view><view style="height:56px;"></view></view></block>
|
<block wx:if="{{pageShow}}"><view><status-nav vue-id="d877afa2-1" statusBackw="{{true}}" whereCome="{{2}}" iscenter="{{true}}" statusTitleImg="{{true}}" statusTitle="{{true}}" title-val="购物车" tabcolor="#ffffff" bind:__l="__l"></status-nav><view style="{{'padding-top:'+(statusHNH+10+'px')+';'}}"><view class="padding-zy20 bacb"><block wx:for="{{gouwList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{gouwList.length!=0}}"><view class="{{['padding-sx30','disba','borbot','animated','',delCur==index?'fadeOutUp ':'']}}"><view class="disac"><view class="margin-y20"><label class="radio"><radio checked="{{item.status}}" color="#ff7800" data-event-opts="{{[['tap',[['choose',[index]]]]]}}" catchtap="__e"></radio></label></view><image class="radius10 gouwcimg" src="{{item.src}}" mode="aspectFill" data-event-opts="{{[['tap',[['checkDetail',['$0'],[[['gouwList','',index,'spu_id']]]]]]]}}" bindtap="__e"></image></view><view class="padding-z20"><view class="dis"><view class="clips2 fon28 color33 margin-y20 width100" style="line-height:46rpx;">{{item.title}}</view><image class="flexs margin-s10" style="width:30rpx;height:30rpx;" src="../../../static/img/gouwc/del.png" mode data-event-opts="{{[['tap',[['clear',['$0',index],[[['gouwList','',index,'id']]]]]]]}}" catchtap="__e"></image></view><view data-event-opts="{{[['tap',[['chooseCate',[index]]]]]}}" class="disbcac margin-s10 margin-x20 xuanz posir fon24 color9 " bindtap="__e"><view class="clips1">{{item.cateArr[0].sku_name}}</view><image class="margin-z20 flexs" style="width:17rpx;height:10rpx;" src="../../../static/img/gouwc/xia.png" mode></image><block wx:if="{{current==index}}"><view class="posia textc padding-x20" style="top:60rpx;left:0;right:0;background-color:rgb(245, 245, 245);border-radius:6rpx;"><scroll-view style="height:100rpx;" scroll-y="true"><view class="discc"><block wx:for="{{item.cateArr}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view data-event-opts="{{[['tap',[['cateChoose',[index,index1]]]]]}}" class="clips1 margin-s20" style="width:80%;" bindtap="__e">{{item1.sku_name}}</view></block></view></scroll-view></view></block></view><view class="margin-s30 disba"><view class="colorf6 fon24 bold width100">￥<text class="fon28">{{item.price}}</text>.0</view><view class="disac"><button class="deladd fon36 color33" disabled="{{item.num==1}}" data-event-opts="{{[['tap',[['deladdEvent',['$0',index,0],[[['gouwList','',index,'id']]]]]]]}}" catchtap="__e">-</button><input style="width:60%;background-color:#F5F5F5;text-align:center;padding:4rpx 0;border-radius:4rpx;" type="text" disabled="{{true}}" data-event-opts="{{[['input',[['__set_model',['$0','num','$event',[]],[[['gouwList','',index]]]]]]]}}" value="{{item.num}}" bindinput="__e"/><button data-event-opts="{{[['tap',[['deladdEvent',['$0',index,1],[[['gouwList','',index,'id']]]]]]]}}" class="deladd fon36 color33" catchtap="__e">+</button></view></view></view></view></block></block><block wx:if="{{gouwList.length==0}}"><view class="kongk">空空如也</view></block></view></view><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">猜你喜欢</view><view class="gouwcxian margin-z20"></view></view><twocolu-list vue-id="d877afa2-2" dataList="{{dataList}}" data-event-opts="{{[['^addChe',[['addChe']]]]}}" bind:addChe="__e" bind:__l="__l"></twocolu-list><block wx:if="{{user_type!='personal'}}"><view class="posi-bzy disba padding-zy20 gouwcb-box"><view class="disac"><label class="radio disac" style="margin-top:-6rpx;"><radio checked="{{allcheck}}" color="#ff7800" data-event-opts="{{[['tap',[['allchoose',['$event']]]]]}}" bindtap="__e"></radio><view class="margin-z10 margin-y20 margin-s10">全选</view></label><view class="fon36">合计:<label class="colorf6 bold">{{"￥"+allPrice+".0"}}</label></view></view><block wx:if="{{allNum!=0}}"><button class="colorb bold gouwcbtn" disabled="{{disb}}" data-event-opts="{{[['tap',[['gopay',['$event']]]]]}}" bindtap="__e">{{disb?'正在前往...':'去结算('+allNum+')'}}</button></block><block wx:else><button data-event-opts="{{[['tap',[['goGouw',['$event']]]]]}}" class="colorb bold gouwcbtn" bindtap="__e">去购物</button></block></view></block><view style="height:56px;"></view></view></block>
|
||||||
|
|
@ -253,8 +253,9 @@ __webpack_require__.r(__webpack_exports__);
|
||||||
pageShow: false,
|
pageShow: false,
|
||||||
titleVal: '',
|
titleVal: '',
|
||||||
xiaj: false, //是否下架
|
xiaj: false, //是否下架
|
||||||
showShare: true };
|
showShare: true,
|
||||||
|
user_type: uni.getStorageSync('user_type') //权限
|
||||||
|
};
|
||||||
},
|
},
|
||||||
onPageScroll: function onPageScroll(e) {
|
onPageScroll: function onPageScroll(e) {
|
||||||
e.scrollTop > 360 ? this.showTop = true : this.showTop = false;
|
e.scrollTop > 360 ? this.showTop = true : this.showTop = false;
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<view class="padding-x120"><status-nav vue-id="4df589b9-1" statusBackw="{{true}}" whereCome="{{whereCome*1}}" statusTitle="{{true}}" title-val="{{titleVal}}" tabcolor="#ffffff" bind:__l="__l"></status-nav><block wx:if="{{pageShow}}"><view><view class="bacb padding-x20" style="{{'padding-top:'+(statusHNH+10+'px')+';'}}"><image style="height:682rpx;width:100%;margin-top:20rpx;" src="{{zhuImg}}" mode="aspectFit"></image><view class="margin20"><view class="disba"><view><view class="colorf78 fon24 bold">￥<text class="fon36">{{proDetailTwo.cur_price/100}}</text>.00</view><view class="color9 fon24 dis">原价<text style="text-decoration:line-through;">{{"￥"+proDetailTwo.price/100+".00"}}</text></view></view><view data-event-opts="{{[['tap',[['collection',['$0'],['proDetail.id']]]]]}}" class="discc" bindtap="__e"><block wx:if="{{isCollection}}"><image style="width:40rpx;height:38rpx;" src="/static/img/public/shouc.png" mode></image></block><block wx:else><image class="animated bounceIn" style="width:40rpx;height:38rpx;" src="/static/img/public/shoucactive.png" mode></image></block><view class="fon24 color9 margin-s10">收藏</view></view></view><view class="color33 fon32 margin-sx16 clips2">{{proDetail.name}}</view><view class="fon24 color9">{{proDetail.sub_title}}</view></view></view><view class="margin-s20 bacb"><view class="disba padding-sx20 padding-zy20"><view class="fon32 bold">{{"商品评价("+evalTotal+")"}}</view><view class="disac"><view data-event-opts="{{[['tap',[['checkAllp',['$0'],['proDetail.id']]]]]}}" class="fon26 color9 margin-y10" bindtap="__e">查看全部</view><image style="width:12rpx;height:22rpx;" src="/static/img/my/youj.png" mode></image></view></view><evaluate-list vue-id="4df589b9-2" eval-arr="{{evalArr}}" isEval="{{true}}" isShow="{{false}}" len="{{2}}" bind:__l="__l"></evaluate-list></view><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">商品详情</view><view class="gouwcxian margin-z20"></view></view><view class="padding20 bacb"><view class="fon32 bold margin-sx10" style="color:#353535;">规格与包装</view><view class="disba fon24 color6 flw"><block wx:if="{{proDetail.brand_name!=''}}"><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;"><text>品牌</text></view><view class="flexs clips1">{{"：\t"+proDetail.brand_name+''}}</view></view></block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品编号</view><view class="clips1">{{"：\t"+proDetailTwo.coding}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品名称</view><view class="clips1">{{"：\t"+proDetail.name}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">类别</view><view class="flexs clips1">{{"：\t"+proDetail.category_name}}</view></view><block wx:for="{{proDetailTwo.own_spec}}" wx:for-item="itemspec" wx:for-index="indexspec" wx:key="indexspec"><block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">{{itemspec.name}}</view><view class="flexs clips1">{{"："+itemspec.value+itemspec.unit}}</view></view></block></block></view><view class="margin-s20"><rich-text nodes="{{detailCon}}"></rich-text></view></view><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">猜你喜欢</view><view class="gouwcxian margin-z20"></view></view><twocolu-list vue-id="4df589b9-3" dataList="{{dataList}}" data-event-opts="{{[['^addChe',[['addChe']]]]}}" bind:addChe="__e" bind:__l="__l"></twocolu-list><block wx:if="{{showShare}}"><button style="border:none;" data-name="shareBtn" open-type="share" plain="true"><image class="zIn5 share animated pulse infinite" src="/static/img/product/share.png" mode></image></button></block><bottomkf vue-id="4df589b9-4" detail="{{proDetail}}" sku_img="{{sku_img}}" data-event-opts="{{[['^diaoq',[['proDetailEv']]]]}}" bind:diaoq="__e" bind:__l="__l"></bottomkf><back-top vue-id="4df589b9-5" showTop="{{showTop}}" data-event-opts="{{[['^backTop',[['backTop']]]]}}" bind:backTop="__e" bind:__l="__l"></back-top></view></block><block wx:if="{{xiaj}}"><view class="zanwu">该商品已下架，将自动返回</view></block></view>
|
<view class="padding-x120"><status-nav vue-id="4df589b9-1" statusBackw="{{true}}" whereCome="{{whereCome*1}}" statusTitle="{{true}}" title-val="{{titleVal}}" tabcolor="#ffffff" bind:__l="__l"></status-nav><block wx:if="{{pageShow}}"><view><view class="bacb padding-x20" style="{{'padding-top:'+(statusHNH+10+'px')+';'}}"><image style="height:682rpx;width:100%;margin-top:20rpx;" src="{{zhuImg}}" mode="aspectFit"></image><view class="margin20"><view class="disba"><view><view class="colorf78 fon24 bold">￥<text class="fon36">{{proDetailTwo.cur_price/100}}</text>.00</view><view class="color9 fon24 dis">原价<text style="text-decoration:line-through;">{{"￥"+proDetailTwo.price/100+".00"}}</text></view></view><view data-event-opts="{{[['tap',[['collection',['$0'],['proDetail.id']]]]]}}" class="discc" bindtap="__e"><block wx:if="{{isCollection}}"><image style="width:40rpx;height:38rpx;" src="/static/img/public/shouc.png" mode></image></block><block wx:else><image class="animated bounceIn" style="width:40rpx;height:38rpx;" src="/static/img/public/shoucactive.png" mode></image></block><view class="fon24 color9 margin-s10">收藏</view></view></view><view class="color33 fon32 margin-sx16 clips2">{{proDetail.name}}</view><view class="fon24 color9">{{proDetail.sub_title}}</view></view></view><block wx:if="{{user_type!='personal'}}"><view class="margin-s20 bacb"><view class="disba padding-sx20 padding-zy20"><view class="fon32 bold">{{"商品评价("+evalTotal+")"}}</view><view class="disac"><view data-event-opts="{{[['tap',[['checkAllp',['$0'],['proDetail.id']]]]]}}" class="fon26 color9 margin-y10" bindtap="__e">查看全部</view><image style="width:12rpx;height:22rpx;" src="/static/img/my/youj.png" mode></image></view></view><evaluate-list vue-id="4df589b9-2" eval-arr="{{evalArr}}" isEval="{{true}}" isShow="{{false}}" len="{{2}}" bind:__l="__l"></evaluate-list></view></block><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">商品详情</view><view class="gouwcxian margin-z20"></view></view><view class="padding20 bacb"><view class="fon32 bold margin-sx10" style="color:#353535;">规格与包装</view><view class="disba fon24 color6 flw"><block wx:if="{{proDetail.brand_name!=''}}"><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;"><text>品牌</text></view><view class="flexs clips1">{{"：\t"+proDetail.brand_name+''}}</view></view></block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品编号</view><view class="clips1">{{"：\t"+proDetailTwo.coding}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品名称</view><view class="clips1">{{"：\t"+proDetail.name}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">类别</view><view class="flexs clips1">{{"：\t"+proDetail.category_name}}</view></view><block wx:for="{{proDetailTwo.own_spec}}" wx:for-item="itemspec" wx:for-index="indexspec" wx:key="indexspec"><block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">{{itemspec.name}}</view><view class="flexs clips1">{{"："+itemspec.value+itemspec.unit}}</view></view></block></block></view><view class="margin-s20"><rich-text nodes="{{detailCon}}"></rich-text></view></view><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">猜你喜欢</view><view class="gouwcxian margin-z20"></view></view><twocolu-list vue-id="4df589b9-3" dataList="{{dataList}}" data-event-opts="{{[['^addChe',[['addChe']]]]}}" bind:addChe="__e" bind:__l="__l"></twocolu-list><block wx:if="{{showShare}}"><button style="border:none;" data-name="shareBtn" open-type="share" plain="true"><image class="zIn5 share animated pulse infinite" src="/static/img/product/share.png" mode></image></button></block><bottomkf vue-id="4df589b9-4" detail="{{proDetail}}" sku_img="{{sku_img}}" data-event-opts="{{[['^diaoq',[['proDetailEv']]]]}}" bind:diaoq="__e" bind:__l="__l"></bottomkf><back-top vue-id="4df589b9-5" showTop="{{showTop}}" data-event-opts="{{[['^backTop',[['backTop']]]]}}" bind:backTop="__e" bind:__l="__l"></back-top></view></block><block wx:if="{{xiaj}}"><view class="zanwu">该商品已下架，将自动返回</view></block></view>
|
||||||
Loading…
Reference in New Issue