cmx #37

Merged
cmx merged 4 commits from cmx into master 2020-08-10 12:26:58 +00:00
11 changed files with 129 additions and 79 deletions
Showing only changes of commit 9fac4e8a2e - Show all commits

View File

@ -2,7 +2,7 @@
<view class="details"> <view class="details">
<view class="box" v-if="type<4"> <view class="box" v-if="type<4">
<view class="goods-info" v-for="list in info.extend_order_goods"> <view class="goods-info" v-for="list in info.extend_order_goods">
<image :src="list.goods_image"></image> <image :src="list.image_480_url"></image>
<view class="info-right"> <view class="info-right">
<view class="name u-line-1">{{ list.goods_name }}</view> <view class="name u-line-1">{{ list.goods_name }}</view>
<view class="info"> <view class="info">
@ -39,6 +39,7 @@
<view> <view>
<view class="title">姓名</view> <view class="title">姓名</view>
<view class="value">{{ info.extend_order_common.reciver_name }}</view> <view class="value">{{ info.extend_order_common.reciver_name }}</view>
<image src="/static/image/home/chat.png" @click="tochat(info.buyer_id)"></image>
</view> </view>
<view> <view>
<view class="title">手机号</view> <view class="title">手机号</view>
@ -526,6 +527,11 @@ export default {
} }
.value { .value {
font-size: 26rpx; font-size: 26rpx;
flex: 1;
}
image{
width: 40rpx;
height: 40rpx;
} }
} }
} }

View File

@ -2,7 +2,7 @@
<view class="home"> <view class="home">
<view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view> <view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view>
<view class="tab-swiper"> <view class="tab-swiper">
<u-tabs-swiper <!-- <u-tabs-swiper
ref="uTabs" ref="uTabs"
:list="list" :list="list"
:current="current" :current="current"
@ -14,7 +14,8 @@
:show-bar="false" :show-bar="false"
swiperWidth="750" swiperWidth="750"
gutter="52" gutter="52"
></u-tabs-swiper> ></u-tabs-swiper> -->
<u-tabs :list="list" font-size="26" gutter="10" item-width="140" bar-width="130" 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>
@ -34,7 +35,7 @@
<view class="title">选择订单号</view> <view class="title">选择订单号</view>
<view class="worker" v-if="JSON.stringify(worker) != '{}'"> <view class="worker" v-if="JSON.stringify(worker) != '{}'">
<view>{{ worker.name }}</view> <view>{{ worker.name }}</view>
<u-icon name="edit-pen" @click="worker = {}"></u-icon> <u-icon name="arrow-down" @click="worker = {}"></u-icon>
</view> </view>
<view v-else class="select" @click="showSelect = true"> <view v-else class="select" @click="showSelect = true">
<view>请选择</view> <view>请选择</view>
@ -358,6 +359,13 @@ export default {
}, },
// //
setWorker(e) { setWorker(e) {
if(e[0].label==null){
this.$refs.uToast.show({
title: "选择无效",
type: 'error'
});
return
}
let arr = this.carlist; let arr = this.carlist;
for (let index in arr) { for (let index in arr) {
if (arr[index].takeawayer_id == e[0].value) { if (arr[index].takeawayer_id == e[0].value) {

View File

@ -33,7 +33,7 @@
<view> <view>
<view class="titles">标签</view> <view class="titles">标签</view>
<view class="form-view active" @click="show_add()">+ 新建标签</view> <view class="form-view active" @click="show_add()">+ 新建标签</view>
<view :class="['form-view',item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)"> <view :class="['form-view', item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
{{ item.name }} {{ item.name }}
</view> </view>
</view> </view>
@ -46,10 +46,17 @@
<view class="title"><text>选择商品</text></view> <view class="title"><text>选择商品</text></view>
<!-- 商品列表 --> <!-- 商品列表 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll"> <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
<view class="listes_shoping" v-for="(item, index) in list" :key="index" @click="checkboxChange(item.goods_id)"> <view class="listes_shoping" v-for="(item, index) in list" :key="index">
<view> <view>
<u-checkbox-group> <u-checkbox-group>
<u-checkbox shape="circle" active-color="#FF780F" v-model="item.checked" :disabled="true"></u-checkbox> <u-checkbox
shape="circle"
size="40"
active-color="#FF780F"
v-model="item.checked"
:name="index"
@change="checkboxChange"
></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
<view><image :src="item.goods_image" mode="widthFix"></image></view> <view><image :src="item.goods_image" mode="widthFix"></image></view>
@ -118,6 +125,8 @@ export default {
checked: false, checked: false,
list: [], list: [],
List_tosign: [], List_tosign: [],
flagA: true,
flagB: false,
scrollTop: 0, scrollTop: 0,
imgarr: [], // imgarr: [], //
cover: '', // cover: '', //
@ -137,14 +146,17 @@ export default {
for (let index in arr) { for (let index in arr) {
newarr.push(arr[index].file_id); newarr.push(arr[index].file_id);
} }
this.$u.api.publishphoto({ console.log(this.imgarrA);
this.$u.api
.publishphoto({
article_title: this.form.name, article_title: this.form.name,
article_content: this.form.intro, article_content: this.form.intro,
article_pic: this.imgarrA[0].file_name, article_pic: this.imgarrA[0].file_name,
file_id: newarr, file_id: newarr,
goods_id_arr: this.arres_list, goods_id_arr: this.arres_list,
label_arr: this.selectarr label_arr: this.selectarr
}).then(res => { })
.then(res => {
if (res.errCode != 0) { if (res.errCode != 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
@ -155,11 +167,11 @@ export default {
title: res.message, title: res.message,
type: 'success' type: 'success'
}); });
setTimeout(function(){ setTimeout(function() {
uni.navigateBack({ uni.navigateBack({
delta:1 delta: 1
}) });
},1000) }, 1000);
} }
}); });
}, },
@ -207,9 +219,11 @@ export default {
}, },
// //
addLiveSpec() { addLiveSpec() {
this.$u.api.createLivesp({ this.$u.api
.createLivesp({
spec_name: this.tagcontent spec_name: this.tagcontent
}).then(res => { })
.then(res => {
if (res.errCode != 0) { if (res.errCode != 0) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
@ -227,15 +241,30 @@ export default {
}, },
// //
uploadcover(data) { uploadcover(data) {
console.log(data);
if (data.errCode != 0) {
this.$refs.uToast.show({
title: '上传失败',
type: 'error'
});
} else {
let obj = data.data; let obj = data.data;
obj.url = obj.file_path; obj.url = obj.file_path;
this.imgarrA.push(obj); this.imgarrA.push(obj);
}
}, },
// //
uploadphoto(data) { uploadphoto(data) {
if (data.errCode != 0) {
this.$refs.uToast.show({
title: '上传失败',
type: 'error'
});
} else {
let obj = data.data; let obj = data.data;
obj.url = obj.file_path; obj.url = obj.file_path;
this.imgarrB.push(obj); this.imgarrB.push(obj);
}
}, },
changes() { changes() {
let that = this; let that = this;
@ -246,16 +275,14 @@ export default {
}, },
// checkbox // checkbox
checkboxChange(e) { checkboxChange(e) {
let id = e; let that = this;
for(let num in this.list){ let num =Number(e.name)
if(id==this.list[num].goods_id){ if (e.value == true) {
if(this.list[num].checked==true){ that.delarr(that.list[num].goods_id);
this.delarr(id); that.list[num].checked=true
}else{ } else {
this.pushes(id); that.pushes(that.list[num].goods_id);
} that.list[num].checked=false
this.list[num].checked = !this.list[num].checked
}
} }
}, },
// //
@ -288,7 +315,7 @@ export default {
} else { } else {
let arr = res.data.list; let arr = res.data.list;
for (let index in arr) { for (let index in arr) {
arr[index].checked = false; arr[index].checked = true;
} }
this.list = arr; this.list = arr;
} }
@ -312,7 +339,7 @@ export default {
margin: 0 auto; margin: 0 auto;
.form-view { .form-view {
background: #CDC7C8; background: #cdc7c8;
border-radius: 6rpx; border-radius: 6rpx;
margin-right: 20rpx; margin-right: 20rpx;
font-size: 24rpx; font-size: 24rpx;
@ -322,7 +349,7 @@ export default {
color: #fff; color: #fff;
} }
.active { .active {
background: #FF780F; background: #ff780f;
} }
.scroll { .scroll {
width: 100%; width: 100%;

View File

@ -37,10 +37,17 @@
<view class="title"><text>选择商品</text></view> <view class="title"><text>选择商品</text></view>
<!-- 商品列表 --> <!-- 商品列表 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll"> <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
<view class="listes_shoping" v-for="(item, index) in list" :key="index" @click="checkboxChange(item.goods_id)"> <view class="listes_shoping" v-for="(item, index) in list" :key="index">
<view> <view>
<u-checkbox-group> <u-checkbox-group>
<u-checkbox shape="circle" active-color="#FF780F" v-model="item.checked" :disabled="true" ></u-checkbox> <u-checkbox
shape="circle"
size="40"
active-color="#FF780F"
v-model="item.checked"
:name="index"
@change="checkboxChange"
></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
<view><image :src="item.goods_image" mode="widthFix"></image></view> <view><image :src="item.goods_image" mode="widthFix"></image></view>
@ -275,15 +282,14 @@ export default {
}, },
// checkbox // checkbox
checkboxChange(e) { checkboxChange(e) {
for(let num in this.list){ let that = this;
if(id==this.list[num].goods_id){ let num =Number(e.name)
if(this.list[num].checked==true){ if (e.value == true) {
this.delarr(id); that.delarr(that.list[num].goods_id);
}else{ that.list[num].checked=true
this.pushes(id); } else {
} that.pushes(that.list[num].goods_id);
this.list[num].checked = !this.list[num].checked that.list[num].checked=false
}
} }
}, },
// //

View File

@ -57,6 +57,9 @@ export default {
title: res.message, title: res.message,
type: 'success' type: 'success'
}); });
uni.navigateBack({
delta:1
})
} }
}); });
}, },

Binary file not shown.

Before

Width:  |  Height:  |  Size: 805 B

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 774 B

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 841 B

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 753 B

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 761 B

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 3.3 KiB