theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into gyh

Browse Source
This commit is contained in:
Gdpao 2020-08-15 19:09:29 +08:00
commit d1aaa525ed
4 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/order-item/testlist.vue
View File

@ -34,6 +34,9 @@ export default {
toDetailsPage() { toDetailsPage() {
let type =0 let type =0
let info = this.info let info = this.info
if(info.is_delete == 1){
return ;
}
if(info.goods_try_order_status==0){ if(info.goods_try_order_status==0){
type=1 type=1
}else if(info.goods_try_order_status==20){ }else if(info.goods_try_order_status==20){

13
pages/index/index.vue
View File

@ -4,17 +4,24 @@
<view class="tab-swiper"> <view class="tab-swiper">
<u-tabs :list="list" font-size="26" gutter="10" item-width="130" bar-width="120" active-color="#FF780F" :current="current" @change="tabsChange"></u-tabs> <u-tabs :list="list" font-size="26" gutter="10" item-width="130" bar-width="120" active-color="#FF780F" :current="current" @change="tabsChange"></u-tabs>
</view> </view>
<view class="order-list" v-if="current == 0"> <view class="order-list" v-if="current == 0">
<view v-for="(item, index) in allorder" :key="index"><OrderItem :info="item"></OrderItem></view> <view v-for="(item, index) in allorder" :key="index"><OrderItem :info="item"></OrderItem></view>
<u-empty margin-top="20" v-if="!allorder.length" mode="order"></u-empty>
</view> </view>
<view v-else-if="current == 1"> <view v-else-if="current == 1">
<view v-for="(item, index) in testlist" :key="index"><testList :info="item"></testList></view> <view v-for="(item, index) in testlist" :key="index"><testList :info="item"></testList></view>
<u-empty margin-top="20" v-if="!testlist.length" mode="order"></u-empty>
</view> </view>
<view v-else-if="current == 2"> <view v-else-if="current == 2">
<view v-for="(item, index) in worklist" :key="index"><OrderItem :info="item"></OrderItem></view> <view v-for="(item, index) in worklist" :key="index"><OrderItem :info="item"></OrderItem></view>
<u-empty margin-top="20" v-if="!worklist.length" mode="order"></u-empty>
</view> </view>
<view v-else-if="current == 3"> <view v-else-if="current == 3">
<view v-for="(item, index) in translist" :key="index"><OrderItem :info="item"></OrderItem></view> <view v-for="(item, index) in translist" :key="index"><OrderItem :info="item"></OrderItem></view>
<u-empty margin-top="20" v-if="!translist.length" mode="order"></u-empty>
</view> </view>
<view v-else-if="current == 4"> <view v-else-if="current == 4">
<view class="complaint"> <view class="complaint">
@ -41,11 +48,13 @@
<view v-for="(item, index) in finshlist" :key="index"> <view v-for="(item, index) in finshlist" :key="index">
<OrderItem :info="item"></OrderItem> <OrderItem :info="item"></OrderItem>
</view> </view>
<u-empty margin-top="20" v-if="!finshlist.length" mode="order"></u-empty>
</view> </view>
<view v-else-if="current == 6"> <view v-else-if="current == 6">
<view v-for="(item, index) in badlist" :key="index"> <view v-for="(item, index) in badlist" :key="index">
<OrderItem :info="item"></OrderItem> <OrderItem :info="item"></OrderItem>
</view> </view>
<u-empty margin-top="20" v-if="!badlist.length" mode="order"></u-empty>
</view> </view>
<view class="release-btn" @click="publish"> <view class="release-btn" @click="publish">
<image src="../../static/image/index/publish.png"></image> <image src="../../static/image/index/publish.png"></image>
@ -147,7 +156,7 @@ export default {
this.getallorder(0); this.getallorder(0);
const user = uni.getStorageSync('userinfo'); const user = uni.getStorageSync('userinfo');
console.log(user) console.log(user)
this.imService.login(user.userId,user.member_avatar,"") this.imService.login(user.userId,user.member_nickname,user.member_avatar)
this.imService.connectIM() this.imService.connectIM()
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 // 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
}, },
@ -285,7 +294,7 @@ export default {
getshiftlist() { getshiftlist() {
let that = this; let that = this;
this.$u.api.getshiftlist({}).then(res => { this.$u.api.getshiftlist({}).then(res => {
console.log(res); console.log(JSON.stringify(res));
if (res.errCode != 0) { if (res.errCode != 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,

3
pages/release/tosign.vue
View File

@ -75,7 +75,8 @@
}, },
shangchuan(){ shangchuan(){
uni.showLoading({ uni.showLoading({
title: '上传中' title: '上传中',
mask:true
}); });
}, },
tupian(){ tupian(){

49
pages/user/myinfo.vue
View File

@ -89,33 +89,33 @@ export default {
}, },
// 跳转发布页面 // 跳转发布页面
navto(url) { navto(url) {
// 判断直播权限 // // 判断直播权限
if(url=="release/tosign"){ // if(url=="release/tosign"){
this.$u.api.canlive({}).then(res => { // this.$u.api.canlive({}).then(res => {
console.log(res); // console.log(JSON.stringify(res));
if (res.errCode != 0) { // if (res.errCode != 0) {
this.$refs.uToast.show({ // this.$refs.uToast.show({
title: res.message, // title: res.message,
type: 'error' // type: 'error'
}); // });
} else { // } else {
if(res.data.live_stataes==0){ // if(res.data.live_stataes==0){
this.$u.route({ // this.$u.route({
url: `/pages/${url}` // url: `/pages/${url}`
}); // });
}else{ // }else{
this.$refs.uToast.show({ // this.$refs.uToast.show({
title: "当前用户没有直播权限", // title: "当前用户没有直播权限",
type: 'error' // type: 'error'
}); // });
} // }
} // }
}); // });
}else{ // }else{
this.$u.route({ this.$u.route({
url: `/pages/${url}` url: `/pages/${url}`
}); });
} // }
} }
@ -201,7 +201,6 @@ export default {
width: 110rpx; width: 110rpx;
height: 110rpx; height: 110rpx;
border-radius: 50%; border-radius: 50%;
background-color: #0f0;
} }
.name{ .name{
font-size: 24rpx; font-size: 24rpx;