代码更新
This commit is contained in:
jia
parent
23e0d533d4
commit
ace704210b
1
App.vue
1
App.vue
@ -444,6 +444,7 @@
|
|||||||
@import 'static/iconfont/iconfont.css';
|
@import 'static/iconfont/iconfont.css';
|
||||||
@import 'static/iconfont/iconlihai.css';
|
@import 'static/iconfont/iconlihai.css';
|
||||||
@import 'static/iconfont/icontan.css';
|
@import 'static/iconfont/icontan.css';
|
||||||
|
@import 'static/iconfont/demo.css';
|
||||||
@import 'static/css/style.scss';
|
@import 'static/css/style.scss';
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,7 @@ import request from "@/utils/request.js";
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
export function cloudWarehouse(data) {
|
export function cloudWarehouse(data) {
|
||||||
return request.get("store/product/cloudWarehouse", data);
|
return request.get("store/product/cloudWarehouse", data, { noAuth: true });
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 获取云仓分类
|
* 获取云仓分类
|
||||||
|
|||||||
@ -130,6 +130,7 @@ export function Modal(title = '提示', content = '这是一个模态弹窗!', o
|
|||||||
}) {
|
}) {
|
||||||
return new Promise((reslove, reject) => {
|
return new Promise((reslove, reject) => {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
|
...obj,
|
||||||
title: title,
|
title: title,
|
||||||
content: content,
|
content: content,
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
|
|||||||
@ -4,6 +4,8 @@
|
|||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.4.7",
|
"versionName" : "1.4.7",
|
||||||
"versionCode" : 147,
|
"versionCode" : 147,
|
||||||
|
"versionName" : "1.4.7",
|
||||||
|
"versionCode" : 147,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
@ -31,7 +33,8 @@
|
|||||||
"UniMP" : {
|
"UniMP" : {
|
||||||
"description" : "uni小程序"
|
"description" : "uni小程序"
|
||||||
},
|
},
|
||||||
"Maps" : {}
|
"Maps" : {},
|
||||||
|
"Push" : {}
|
||||||
},
|
},
|
||||||
"safearea" : {
|
"safearea" : {
|
||||||
"bottom" : {
|
"bottom" : {
|
||||||
@ -120,7 +123,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth" : {},
|
"oauth" : {},
|
||||||
"ad" : {}
|
"ad" : {},
|
||||||
|
"push" : {}
|
||||||
},
|
},
|
||||||
"icons" : {
|
"icons" : {
|
||||||
"android" : {
|
"android" : {
|
||||||
@ -161,7 +165,7 @@
|
|||||||
"nativePlugins" : {
|
"nativePlugins" : {
|
||||||
"JG-JCore" : {
|
"JG-JCore" : {
|
||||||
"JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
|
"JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
|
||||||
"JPUSH_CHANNEL_IOS" : "",
|
"JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
|
||||||
"JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
|
"JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
|
||||||
"JPUSH_CHANNEL_ANDROID" : "",
|
"JPUSH_CHANNEL_ANDROID" : "",
|
||||||
"__plugin_info__" : {
|
"__plugin_info__" : {
|
||||||
|
|||||||
@ -91,6 +91,7 @@
|
|||||||
import authorize from '@/components/Authorize';
|
import authorize from '@/components/Authorize';
|
||||||
import emptyPage from '@/components/emptyPage.vue'
|
import emptyPage from '@/components/emptyPage.vue'
|
||||||
import { configMap } from '@/utils';
|
import { configMap } from '@/utils';
|
||||||
|
import { navigateBack } from '../../../libs/uniApi';
|
||||||
const app = getApp();
|
const app = getApp();
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
@ -198,6 +199,14 @@
|
|||||||
that.$util.Tips({
|
that.$util.Tips({
|
||||||
title: res.message
|
title: res.message
|
||||||
});
|
});
|
||||||
|
if(res.status==200){
|
||||||
|
// uni.redirectTo({
|
||||||
|
// url:'/admin/orderList/index?types=4&merId='+that.mer_id
|
||||||
|
// })
|
||||||
|
uni.navigateBack({
|
||||||
|
delta:2
|
||||||
|
})
|
||||||
|
}
|
||||||
that.getOrderData();
|
that.getOrderData();
|
||||||
})
|
})
|
||||||
.catch(res => {
|
.catch(res => {
|
||||||
|
|||||||
@ -293,6 +293,9 @@
|
|||||||
this.merId = option.merId;
|
this.merId = option.merId;
|
||||||
this.getIndex();
|
this.getIndex();
|
||||||
},
|
},
|
||||||
|
onShow(){
|
||||||
|
this.getIndex();
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 关闭二维码弹窗
|
// 关闭二维码弹窗
|
||||||
popUpClose() {
|
popUpClose() {
|
||||||
|
|||||||
@ -134,11 +134,15 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
let params = {
|
let params = {
|
||||||
status: that.status,
|
status: that.status,
|
||||||
fail_message: that.fail_message
|
fail_message: that.fail_message
|
||||||
}
|
}
|
||||||
if(that.orderInfo.refund_type == 2){
|
|
||||||
|
|
||||||
|
if(that.orderInfo.refund_type == 2 && that.status != -1){
|
||||||
if (!that.refundInfo.mer_delivery_user) {
|
if (!that.refundInfo.mer_delivery_user) {
|
||||||
return that.$util.Tips({
|
return that.$util.Tips({
|
||||||
title: '请填写收货人姓名'
|
title: '请填写收货人姓名'
|
||||||
|
|||||||
@ -122,6 +122,7 @@
|
|||||||
},
|
},
|
||||||
// 扫码核销
|
// 扫码核销
|
||||||
scanCode() {
|
scanCode() {
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
// #ifdef MP || APP-PLUS
|
// #ifdef MP || APP-PLUS
|
||||||
wx.scanCode({
|
wx.scanCode({
|
||||||
@ -129,15 +130,14 @@
|
|||||||
success(res) {
|
success(res) {
|
||||||
self.verify_code = res.result
|
self.verify_code = res.result
|
||||||
// console.log(self.verify_code);
|
// console.log(self.verify_code);
|
||||||
|
console.log('111',self.mer_id,self.verify_code)
|
||||||
verifierOrder(self.mer_id,self.verify_code)
|
verifierOrder(self.mer_id,self.verify_code)
|
||||||
.then(res => {
|
.then(res => {
|
||||||
// uni.navigateTo({
|
|
||||||
// url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
|
|
||||||
// });
|
|
||||||
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
|
url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
|
||||||
});
|
});
|
||||||
|
|
||||||
})
|
})
|
||||||
.catch(res => {
|
.catch(res => {
|
||||||
self.verify_code = ''
|
self.verify_code = ''
|
||||||
@ -165,12 +165,11 @@
|
|||||||
scanType: ["qrCode", "barCode"]
|
scanType: ["qrCode", "barCode"]
|
||||||
}).then(res=>{
|
}).then(res=>{
|
||||||
this.verify_code = res.resultStr
|
this.verify_code = res.resultStr
|
||||||
// uni.navigateTo({
|
|
||||||
// url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
|
|
||||||
// });
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
|
url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
|
||||||
});
|
});
|
||||||
|
|
||||||
// this.codeChange();
|
// this.codeChange();
|
||||||
}).catch(res => {
|
}).catch(res => {
|
||||||
this.$util.Tips({
|
this.$util.Tips({
|
||||||
|
|||||||
@ -53,7 +53,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.product.cart_info.product.store_name}}</div>
|
{{val.product.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
￥{{ item.refundOrder.refund_price }}
|
￥{{ item.refundOrder.refund_price }}
|
||||||
</div>
|
</div>
|
||||||
@ -89,7 +90,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.cart_info.product.store_name}}</div>
|
{{val.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
￥{{ item.orderInfo.pay_price }}
|
￥{{ item.orderInfo.pay_price }}
|
||||||
</div>
|
</div>
|
||||||
@ -114,7 +116,8 @@
|
|||||||
￥{{ item.product.price }}
|
￥{{ item.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.product.store_name}}</div>
|
{{item.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -135,7 +138,8 @@
|
|||||||
￥{{ item.presell.price }}
|
￥{{ item.presell.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.presell.store_name}}</div>
|
{{item.presell.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -156,7 +160,8 @@
|
|||||||
￥{{ item.productGroup.product.price }}
|
￥{{ item.productGroup.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.productGroup.product.store_name}}</div>
|
{{item.productGroup.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -207,7 +212,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.product.cart_info.product.store_name}}</div>
|
{{val.product.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
￥{{ item.refundOrder.refund_price }}
|
￥{{ item.refundOrder.refund_price }}
|
||||||
</div>
|
</div>
|
||||||
@ -216,6 +222,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
|
|
||||||
<!--订单链接-->
|
<!--订单链接-->
|
||||||
<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
|
<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
|
||||||
<div class="broadcast-details_num acea-row row-middle">
|
<div class="broadcast-details_num acea-row row-middle">
|
||||||
@ -243,7 +250,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.cart_info.product.store_name}}</div>
|
{{val.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
￥{{ item.orderInfo.pay_price }}
|
￥{{ item.orderInfo.pay_price }}
|
||||||
</div>
|
</div>
|
||||||
@ -267,7 +275,8 @@
|
|||||||
￥{{ item.product.price }}
|
￥{{ item.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.product.store_name}}</div>
|
{{item.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -288,7 +297,8 @@
|
|||||||
￥{{ item.presell.price }}
|
￥{{ item.presell.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.presell.store_name}}</div>
|
{{item.presell.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -309,7 +319,8 @@
|
|||||||
￥{{ item.productGroup.product.price }}
|
￥{{ item.productGroup.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.productGroup.product.store_name}}</div>
|
{{item.productGroup.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -358,6 +369,7 @@
|
|||||||
<block v-for="(items,index) in history" v-if="userId == 0" :key="items.time">
|
<block v-for="(items,index) in history" v-if="userId == 0" :key="items.time">
|
||||||
<div class="create_time">{{items.time}}</div>
|
<div class="create_time">{{items.time}}</div>
|
||||||
<block v-for="(item,j) in items.children" :key="item.service_log_id">
|
<block v-for="(item,j) in items.children" :key="item.service_log_id">
|
||||||
|
|
||||||
<!-- 左边 -->
|
<!-- 左边 -->
|
||||||
<div class="item acea-row row-top" v-if="item.send_type == 1">
|
<div class="item acea-row row-top" v-if="item.send_type == 1">
|
||||||
<div v-if="item.msn_type !== 100" class="pictrue">
|
<div v-if="item.msn_type !== 100" class="pictrue">
|
||||||
@ -388,7 +400,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.product.cart_info.product.store_name}}</div>
|
{{val.product.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
￥{{ val.product.cart_info.productAttr.price }}
|
￥{{ val.product.cart_info.productAttr.price }}
|
||||||
</div>
|
</div>
|
||||||
@ -425,7 +438,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.cart_info.product.store_name}}</div>
|
{{val.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
￥{{ item.orderInfo.pay_price }}
|
￥{{ item.orderInfo.pay_price }}
|
||||||
</div>
|
</div>
|
||||||
@ -450,7 +464,8 @@
|
|||||||
￥{{ item.product.price }}
|
￥{{ item.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.product.store_name}}</div>
|
{{item.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -471,7 +486,8 @@
|
|||||||
￥{{ item.presell.price }}
|
￥{{ item.presell.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.presell.store_name}}</div>
|
{{item.presell.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -492,7 +508,8 @@
|
|||||||
￥{{ item.productGroup.product.price }}
|
￥{{ item.productGroup.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.productGroup.product.store_name}}</div>
|
{{item.productGroup.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -534,7 +551,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.product.cart_info.product.store_name}}</div>
|
{{val.product.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
共{{item.refundOrder.refund_num}}件商品，
|
共{{item.refundOrder.refund_num}}件商品，
|
||||||
合计 ￥{{ item.refundOrder.refund_price }}
|
合计 ￥{{ item.refundOrder.refund_price }}
|
||||||
@ -571,7 +589,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_picBox noPad">
|
<div class="broadcast_details_picBox noPad">
|
||||||
<div class="broadcast_details_tit">
|
<div class="broadcast_details_tit">
|
||||||
{{val.cart_info.product.store_name}}</div>
|
{{val.cart_info.product.store_name}}
|
||||||
|
</div>
|
||||||
<div class="broadcast_details_pic">
|
<div class="broadcast_details_pic">
|
||||||
￥{{ item.orderInfo.pay_price }}
|
￥{{ item.orderInfo.pay_price }}
|
||||||
</div>
|
</div>
|
||||||
@ -596,7 +615,8 @@
|
|||||||
￥{{ item.product.price }}
|
￥{{ item.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.product.store_name}}</div>
|
{{item.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -617,7 +637,8 @@
|
|||||||
￥{{ item.presell.price }}
|
￥{{ item.presell.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.presell.store_name}}</div>
|
{{item.presell.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -638,7 +659,8 @@
|
|||||||
￥{{ item.productGroup.product.price }}
|
￥{{ item.productGroup.product.price }}
|
||||||
</div>
|
</div>
|
||||||
<div class="broadcast_details_tit_no line1">
|
<div class="broadcast_details_tit_no line1">
|
||||||
{{item.productGroup.product.store_name}}</div>
|
{{item.productGroup.product.store_name}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</navigator>
|
</navigator>
|
||||||
</div>
|
</div>
|
||||||
@ -786,8 +808,10 @@
|
|||||||
<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'"
|
<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'"
|
||||||
v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i>
|
v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
|
|
||||||
</block>
|
</block>
|
||||||
</swiper>
|
</swiper>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -1212,8 +1236,7 @@
|
|||||||
let self = this
|
let self = this
|
||||||
self.$util.uploadImageOne('upload/image', function(res) {
|
self.$util.uploadImageOne('upload/image', function(res) {
|
||||||
if (res.status == 200) {
|
if (res.status == 200) {
|
||||||
self.sendMsg(res.data.path, 3
|
self.sendMsg(res.data.path, 3)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -1603,7 +1626,7 @@
|
|||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
width: 710rpx;
|
width: 710rpx;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 120rpx;
|
bottom: 160rpx;
|
||||||
left: 20rpx;
|
left: 20rpx;
|
||||||
|
|
||||||
.broadcast-details_box,
|
.broadcast-details_box,
|
||||||
@ -1790,6 +1813,7 @@
|
|||||||
|
|
||||||
.broadcast-details .chat .item .text {
|
.broadcast-details .chat .item .text {
|
||||||
margin-left: 20rpx;
|
margin-left: 20rpx;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.broadcast-details .chat .item .text.textR {
|
.broadcast-details .chat .item .text.textR {
|
||||||
@ -1943,19 +1967,23 @@
|
|||||||
transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
|
transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom:var(--status-bar-height);
|
||||||
left: 0;
|
left: 0;
|
||||||
margin-bottom: var(--status-bar-height);;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.broadcast-details .footerCon.on {
|
.broadcast-details .footerCon.on {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -300rpx;
|
top: -360rpx;
|
||||||
|
|
||||||
transform: translate3d(0, 0, 0) !important;
|
transform: translate3d(0, 0, 0) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.broadcast-details .footerCon .banner {
|
.broadcast-details .footerCon .banner {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
|
padding-top: var(--status-bar-height);
|
||||||
}
|
}
|
||||||
|
|
||||||
.broadcast-details .footerCon .banner .swiper-slide {
|
.broadcast-details .footerCon .banner .swiper-slide {
|
||||||
@ -1971,7 +1999,7 @@
|
|||||||
display: block;
|
display: block;
|
||||||
width: 50rpx;
|
width: 50rpx;
|
||||||
height: 50rpx;
|
height: 50rpx;
|
||||||
margin: 40rpx 0 0 50rpx;
|
margin: 20rpx 0 0 40rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets {
|
.broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets {
|
||||||
@ -1980,6 +2008,10 @@
|
|||||||
|
|
||||||
.broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
|
.broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
|
||||||
background-color: #999;
|
background-color: #999;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.broadcast-details .recording {
|
.broadcast-details .recording {
|
||||||
@ -2036,6 +2068,8 @@
|
|||||||
padding: 0 80rpx 0 30rpx;
|
padding: 0 80rpx 0 30rpx;
|
||||||
height: 76rpx;
|
height: 76rpx;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.broadcast-details .footer .placeholder {
|
.broadcast-details .footer .placeholder {
|
||||||
@ -2064,7 +2098,9 @@
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 50rpx;
|
width: 50rpx;
|
||||||
height: 50rpx;
|
height: 50rpx;
|
||||||
margin: 40rpx 0 0 50rpx;
|
|
||||||
|
|
||||||
|
margin: 20rpx 0 0 40rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.emoji-outer {
|
.emoji-outer {
|
||||||
|
|||||||
@ -5,9 +5,10 @@
|
|||||||
<view class="back" @click='set_where(1)'>
|
<view class="back" @click='set_where(1)'>
|
||||||
<view class="iconfont icon-xiangzuo"></view>
|
<view class="iconfont icon-xiangzuo"></view>
|
||||||
</view>
|
</view>
|
||||||
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
|
<view class='input acea-row row-between-wrapper'>
|
||||||
|
<text class='iconfont icon-sousuo'></text>
|
||||||
<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
|
<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
|
||||||
:value='where.keyword' @confirm="searchSubmit" @input="inputChange"></input>
|
:value='where.keyword' @confirm="searchSubmit" @input="inputChange">
|
||||||
</view>
|
</view>
|
||||||
<view style="text-align: right;" v-if="tabIndex==1" class='iconfont'
|
<view style="text-align: right;" v-if="tabIndex==1" class='iconfont'
|
||||||
:class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view>
|
:class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view>
|
||||||
|
|||||||
@ -109,8 +109,8 @@
|
|||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="content_bootm">
|
<view class="content_bootm">
|
||||||
<view class="content_bootm_txt">
|
<view class="content_bootm_txt" v-if="objinfo.product_list.length>0">
|
||||||
查看TA提到的宝贝(2)
|
查看TA提到的宝贝({{objinfo.product_list.length}})
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
@ -124,7 +124,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button>
|
<!-- <button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button> -->
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@ -227,6 +227,7 @@
|
|||||||
import emptyPage from '@/components/emptyPage.vue';
|
import emptyPage from '@/components/emptyPage.vue';
|
||||||
import {
|
import {
|
||||||
entrustlist,
|
entrustlist,
|
||||||
|
addEntrustCart,
|
||||||
finishchain,
|
finishchain,
|
||||||
checkchain
|
checkchain
|
||||||
} from '@/api/sale.js'
|
} from '@/api/sale.js'
|
||||||
@ -365,9 +366,25 @@
|
|||||||
},
|
},
|
||||||
//下单
|
//下单
|
||||||
order(item) {
|
order(item) {
|
||||||
uni.navigateTo({
|
// uni.navigateTo({
|
||||||
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
|
// url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
|
||||||
|
// })
|
||||||
|
addEntrustCart({
|
||||||
|
community_id: item.community_id
|
||||||
|
}).then(res => {
|
||||||
|
|
||||||
|
if (res.status == 200) {
|
||||||
|
this.$util.Tips({
|
||||||
|
title: res.message,
|
||||||
|
icon: 'success'
|
||||||
})
|
})
|
||||||
|
uni.navigateTo({
|
||||||
|
url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
//申请结束委托申请
|
//申请结束委托申请
|
||||||
deteragrss(item) {
|
deteragrss(item) {
|
||||||
|
|||||||
@ -141,8 +141,8 @@
|
|||||||
AllMenuList: [{
|
AllMenuList: [{
|
||||||
name: '商户平台',
|
name: '商户平台',
|
||||||
icon: '/static/applet/shop_app.png',
|
icon: '/static/applet/shop_app.png',
|
||||||
// data: "__UNI__1EE148C",
|
data: "__UNI__1EE148C",
|
||||||
data: '/pages/moreProject/moreProject',
|
|
||||||
type: 2,
|
type: 2,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -359,7 +359,9 @@
|
|||||||
break;
|
break;
|
||||||
// case 2: uniMP.loadMPx(data); break;
|
// case 2: uniMP.loadMPx(data); break;
|
||||||
case 2:
|
case 2:
|
||||||
this.navigator(data);
|
// this.navigator(data);
|
||||||
|
uniMP.loadMPx(data);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
@ -370,14 +372,14 @@
|
|||||||
// #endif
|
// #endif
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
|
|
||||||
if (type == 2) {
|
// if (type == 2) {
|
||||||
this.navigator(data);
|
// this.navigator(`/pages/moreProject/moreProject`);
|
||||||
} else {
|
// } else {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: 'H5不支持打开小程序'
|
title: 'H5不支持打开小程序'
|
||||||
})
|
})
|
||||||
}
|
// }
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
@ -287,7 +287,7 @@
|
|||||||
v-html="description.content.replace(/<br\/>/ig, '')"></view>
|
v-html="description.content.replace(/<br\/>/ig, '')"></view>
|
||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
<view v-else class="product_content">
|
<view v-else class="product_content">
|
||||||
<view v-if="description.content && description.content.title" class="title">
|
<view v-if="description.content && description.content.title" class="product_content_title">
|
||||||
{{description.content.title}}
|
{{description.content.title}}
|
||||||
</view>
|
</view>
|
||||||
<view v-if="description.content && description.content.image" class="pictures" style="background-color: #fff;">
|
<view v-if="description.content && description.content.image" class="pictures" style="background-color: #fff;">
|
||||||
@ -2520,4 +2520,20 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.product_content{
|
||||||
|
background-color: #fff;
|
||||||
|
&_title{
|
||||||
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
line-height: 50rpx;
|
||||||
|
padding: 28rpx;
|
||||||
|
word-wrap: break-word;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
image{
|
||||||
|
width: 750rpx;
|
||||||
|
height: 750rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@ -118,21 +118,13 @@
|
|||||||
},
|
},
|
||||||
//缴纳保证金
|
//缴纳保证金
|
||||||
paydecimal() {
|
paydecimal() {
|
||||||
if (this.merchant_Data.is_margin != 1) {
|
|
||||||
this.$util.Tips({
|
|
||||||
title: '暂时无需缴纳保证金'
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
let that = this
|
let that = this
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '提示',
|
title: '提示',
|
||||||
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
|
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if (res.confirm) {
|
if (res.confirm) {
|
||||||
|
|
||||||
// console.log('用户点击确定');
|
|
||||||
paymerchant().then((res) => {
|
paymerchant().then((res) => {
|
||||||
|
|
||||||
uni.requestPayment({
|
uni.requestPayment({
|
||||||
provider: 'wxpay',
|
provider: 'wxpay',
|
||||||
orderInfo: res.data
|
orderInfo: res.data
|
||||||
@ -148,12 +140,14 @@
|
|||||||
that.$util.Tips({
|
that.$util.Tips({
|
||||||
title: '支付失败'
|
title: '支付失败'
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('fail:' + JSON.stringify(err));
|
console.log('fail:' + JSON.stringify(err));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
|
that.$util.Tips({
|
||||||
|
title: err
|
||||||
|
})
|
||||||
})
|
})
|
||||||
} else if (res.cancel) {
|
} else if (res.cancel) {
|
||||||
console.log('用户点击取消');
|
console.log('用户点击取消');
|
||||||
@ -163,7 +157,6 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -54,12 +54,14 @@
|
|||||||
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
|
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
|
||||||
<text class="text">订单管理</text>
|
<text class="text">订单管理</text>
|
||||||
</view> -->
|
</view> -->
|
||||||
|
|
||||||
<view class="examine"
|
<view class="examine"
|
||||||
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
|
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
|
||||||
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
|
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
|
||||||
</image>
|
</image>
|
||||||
<text class="text">入库管理</text>
|
<text class="text">入库管理</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="examine"
|
<view class="examine"
|
||||||
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
|
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
|
||||||
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
|
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
|
||||||
@ -82,7 +84,7 @@
|
|||||||
</image>
|
</image>
|
||||||
<text class="text">订单核销</text>
|
<text class="text">订单核销</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
<view class="examine" @click="margin(`/pages/margin/margin`)">
|
||||||
<image class="icon_img" src="@/static/images/jy.png">
|
<image class="icon_img" src="@/static/images/jy.png">
|
||||||
</image>
|
</image>
|
||||||
<text class="text">缴纳保证金</text>
|
<text class="text">缴纳保证金</text>
|
||||||
@ -203,7 +205,11 @@
|
|||||||
</image>
|
</image>
|
||||||
<text class="text">缴纳保证金</text>
|
<text class="text">缴纳保证金</text>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="examine"
|
||||||
|
@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
|
||||||
|
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
|
||||||
|
<text class="text">财务管理</text>
|
||||||
|
</view>
|
||||||
<!-- <view class="examine"
|
<!-- <view class="examine"
|
||||||
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
|
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
|
||||||
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
|
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
|
||||||
@ -318,7 +324,7 @@
|
|||||||
<text class="text">商户设置</text>
|
<text class="text">商户设置</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
<view class="examine" @click="margin(`/pages/margin/margin`)">
|
||||||
<image class="icon_img" src="@/static/images/jy.png">
|
<image class="icon_img" src="@/static/images/jy.png">
|
||||||
</image>
|
</image>
|
||||||
<text class="text">缴纳保证金</text>
|
<text class="text">缴纳保证金</text>
|
||||||
@ -389,7 +395,7 @@
|
|||||||
</image>
|
</image>
|
||||||
<text class="text">商户设置</text>
|
<text class="text">商户设置</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="examine" @click="navigator(`/pages/margin/margin`)">
|
<view class="examine" @click="margin(`/pages/margin/margin`)">
|
||||||
<image class="icon_img" src="@/static/images/jy.png">
|
<image class="icon_img" src="@/static/images/jy.png">
|
||||||
</image>
|
</image>
|
||||||
<text class="text">缴纳保证金</text>
|
<text class="text">缴纳保证金</text>
|
||||||
@ -868,7 +874,7 @@ this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
|
|||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
//
|
|
||||||
logout() {
|
logout() {
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url: '/pages/gather/gather'
|
url: '/pages/gather/gather'
|
||||||
@ -881,10 +887,7 @@ this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
navigator(url, t) {
|
navigator(url, t) {
|
||||||
|
|
||||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
||||||
|
|
||||||
|
|
||||||
if (this.codenote.length == 0) {
|
if (this.codenote.length == 0) {
|
||||||
this.isFshow = true
|
this.isFshow = true
|
||||||
this.countDown()
|
this.countDown()
|
||||||
@ -899,7 +902,6 @@ this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: url
|
url: url
|
||||||
})
|
})
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -151,23 +151,23 @@
|
|||||||
:disable-touch="true">
|
:disable-touch="true">
|
||||||
<swiper-item v-for="(item,index) in cloudList">
|
<swiper-item v-for="(item,index) in cloudList">
|
||||||
<u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
|
<u--image :showLoading="true" :src="item.cover" :class="act_img" width="750rpx"
|
||||||
height="998.83rpx"></u--image>
|
height="718.46rpx"></u--image>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
</swiper>
|
</swiper>
|
||||||
</view>
|
</view>
|
||||||
<view class="" style="height:998.83rpx;" v-if="act_swiper">
|
<view class="" style="height:718.46rpx;" v-if="act_swiper">
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<view class="menu" v-if="showtit" style="transition: 1s;">
|
<view class="menu" v-if="showtit" style="transition: 1s;">
|
||||||
<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
|
<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
|
||||||
:circular="true" previous-margin='270rpx' next-margin='270rpx' :current="current"
|
:circular="true" previous-margin='280rpx' next-margin='280rpx' :current="current"
|
||||||
@change="test">
|
@change="test">
|
||||||
<swiper-item v-for="(item,index) in cloudList" :key="index" @click="clickSwiperFn(index)">
|
<swiper-item v-for="(item,index) in cloudList" :key="index" @click="clickSwiperFn(index)">
|
||||||
<view class="swiper_item" :class="{swiper_item_act:index==current}">
|
<view class="swiper_item" :class="{swiper_item_act:index==current}">
|
||||||
<u--image :showLoading="true" :src="item.background" class="swiper_b"
|
<u--image :showLoading="true" :src="item.background" class="swiper_b"
|
||||||
width="175.23rpx" height="175.23rpx"></u--image>
|
width="140.19rpx" height="140.19rpx"></u--image>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
@ -199,7 +199,7 @@
|
|||||||
<view class="right">
|
<view class="right">
|
||||||
<view class="tit">
|
<view class="tit">
|
||||||
<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
|
<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
|
||||||
{{item.store_info}}
|
{{ item.store_name || item.store_info }}
|
||||||
</view>
|
</view>
|
||||||
<view class="">
|
<view class="">
|
||||||
<view class="good_score">
|
<view class="good_score">
|
||||||
@ -346,8 +346,7 @@
|
|||||||
<!-- 多规格购物车 -->
|
<!-- 多规格购物车 -->
|
||||||
|
|
||||||
|
|
||||||
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
|
|
||||||
</authorize>
|
|
||||||
<view class="" :style="`height:${appInfo.bottom}px;`">
|
<view class="" :style="`height:${appInfo.bottom}px;`">
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -405,7 +404,8 @@
|
|||||||
</u-popup>
|
</u-popup>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
|
||||||
|
</authorize>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
@ -493,7 +493,7 @@
|
|||||||
page_num: 1,
|
page_num: 1,
|
||||||
act_img: "",
|
act_img: "",
|
||||||
cartTagInfo: {},
|
cartTagInfo: {},
|
||||||
isAuto: false,
|
|
||||||
headTop1: "",
|
headTop1: "",
|
||||||
actList: [{
|
actList: [{
|
||||||
tit: '综合',
|
tit: '综合',
|
||||||
@ -511,6 +511,7 @@
|
|||||||
}],
|
}],
|
||||||
status: "loadmore",
|
status: "loadmore",
|
||||||
flag: false,
|
flag: false,
|
||||||
|
isAuto: false,
|
||||||
isShowAuth: false, //是否隐藏授权
|
isShowAuth: false, //是否隐藏授权
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -860,8 +861,9 @@
|
|||||||
},
|
},
|
||||||
addcart(item, i) {
|
addcart(item, i) {
|
||||||
if (!this.isLogin) {
|
if (!this.isLogin) {
|
||||||
this.isAuto = true;
|
console.log('2222')
|
||||||
this.isShowAuth = true
|
this.isAuto = true
|
||||||
|
this.isShowAuth = true;
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1299,11 +1301,11 @@
|
|||||||
|
|
||||||
.menu {
|
.menu {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 748rpx;
|
top: 490rpx;
|
||||||
width: 750rpx;
|
width: 750rpx;
|
||||||
// background-color: rgba(255, 255, 255, 0.7);
|
// background-color: rgba(255, 255, 255, 0.7);
|
||||||
height: 250rpx;
|
height: 250rpx;
|
||||||
// height: 175.23rpx;
|
// height: 140.19rpx;
|
||||||
// box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
|
// box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
|
||||||
// box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
|
// box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
|
||||||
|
|
||||||
@ -1398,9 +1400,9 @@
|
|||||||
|
|
||||||
.act_img {
|
.act_img {
|
||||||
// transition:t;
|
// transition:t;
|
||||||
transform: translateY(-840rpx);
|
transform: translateY(-580rpx);
|
||||||
/* #ifdef APP-PLUS */
|
/* #ifdef APP-PLUS */
|
||||||
transform: translateY(-800rpx);
|
transform: translateY(-540rpx);
|
||||||
/* #endif */
|
/* #endif */
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1427,7 +1429,7 @@
|
|||||||
|
|
||||||
.swipers {
|
.swipers {
|
||||||
width: 750rpx;
|
width: 750rpx;
|
||||||
height: 998.83rpx;
|
height: 718.46rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
@ -1464,7 +1466,7 @@
|
|||||||
font-size: 33.29rpx;
|
font-size: 33.29rpx;
|
||||||
line-height: 50px;
|
line-height: 50px;
|
||||||
background: linear-gradient(to right, #F84221, #FF6D20);
|
background: linear-gradient(to right, #F84221, #FF6D20);
|
||||||
width: 175.23rpx;
|
width: 140.19rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -264,7 +264,8 @@
|
|||||||
<image src="../static/images/no_content.png"></image>
|
<image src="../static/images/no_content.png"></image>
|
||||||
<text>内容不存在，可能被删除了哦~</text>
|
<text>内容不存在，可能被删除了哦~</text>
|
||||||
<navigator class="btn" :open-type="open_grass ? 'switchTab' : 'navigate'"
|
<navigator class="btn" :open-type="open_grass ? 'switchTab' : 'navigate'"
|
||||||
url="/pages/plant_grass/index">返回首页</navigator>
|
url="/pages/index/index">返回首页</navigator>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 他提到的宝贝弹窗 -->
|
<!-- 他提到的宝贝弹窗 -->
|
||||||
@ -532,9 +533,9 @@
|
|||||||
that.followDetail = null
|
that.followDetail = null
|
||||||
that.loadData = false
|
that.loadData = false
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
return that.$util.Tips({
|
// return that.$util.Tips({
|
||||||
title: err
|
// title: err
|
||||||
});
|
// });
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
/*获取评论*/
|
/*获取评论*/
|
||||||
|
|||||||
@ -130,7 +130,7 @@
|
|||||||
selHeight="250upx">
|
selHeight="250upx">
|
||||||
</avatar>
|
</avatar>
|
||||||
<!-- 提到的宝贝弹窗 -->
|
<!-- 提到的宝贝弹窗 -->
|
||||||
<uni-popup ref="associated" type="bottom">
|
<uni-popup ref="associated" type="bottom" style="z-index: 9999;">
|
||||||
<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
|
<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
<!-- 话题弹窗 -->
|
<!-- 话题弹窗 -->
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<view class=" writeBg ">
|
<view class=" writeBg ">
|
||||||
|
|
||||||
<view class="content_list">
|
<view class="content_list">
|
||||||
<view class="content_list_item" @click="inputGoodsDetils">
|
<view class="content_list_item">
|
||||||
<view>商品详情</view>
|
<view>商品详情</view>
|
||||||
<!-- <view class="content_list_item_han">
|
<!-- <view class="content_list_item_han">
|
||||||
<span v-if="disModel" style="color: #000000">去修改</span>
|
<span v-if="disModel" style="color: #000000">去修改</span>
|
||||||
@ -73,13 +73,13 @@
|
|||||||
<span>开启后此商品只能在分销礼包中展示并销售</span>
|
<span>开启后此商品只能在分销礼包中展示并销售</span>
|
||||||
</view> -->
|
</view> -->
|
||||||
<view class="container_input marginTop_none input-goods-detils">
|
<view class="container_input marginTop_none input-goods-detils">
|
||||||
<view class="container_input_item">
|
<!-- <view class="container_input_item">
|
||||||
<view class="container_input_item_label"><span>限购数量</span></view>
|
<view class="container_input_item_label"><span>限购数量</span></view>
|
||||||
<view class="container_input_item_value">
|
<view class="container_input_item_value">
|
||||||
<input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
|
<input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
|
||||||
placeholder-class="inputPlaceHolder" />
|
placeholder-class="inputPlaceHolder" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="container_input_item">
|
<view class="container_input_item">
|
||||||
<view class="container_input_item_label"><span>商品排序</span></view>
|
<view class="container_input_item_label"><span>商品排序</span></view>
|
||||||
<view class="container_input_item_value">
|
<view class="container_input_item_value">
|
||||||
@ -140,6 +140,10 @@
|
|||||||
type: [String, Number],
|
type: [String, Number],
|
||||||
default: ''
|
default: ''
|
||||||
},
|
},
|
||||||
|
showCommodity: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
resetKey: {
|
resetKey: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
@ -162,22 +166,26 @@
|
|||||||
once_count: '', // 限购数量
|
once_count: '', // 限购数量
|
||||||
video_link: ''
|
video_link: ''
|
||||||
},
|
},
|
||||||
goodsDis: {imageList: []},
|
goodsDis: {imageList: [],store_name:""},
|
||||||
store_name:'',
|
store_name:'',
|
||||||
moreThanFlag: true,
|
moreThanFlag: true,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
created() {
|
mounted() {
|
||||||
// console.log('123');
|
|
||||||
this.initData();
|
this.initData();
|
||||||
|
// this.$nextTick(()=>{
|
||||||
|
// this.initData();
|
||||||
|
// })
|
||||||
|
},
|
||||||
|
updated() {
|
||||||
|
// this.initData();
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
addGoodsSecoundData: {
|
addGoodsSecoundData: {
|
||||||
handler(val) {
|
handler(val) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
setStorage(this.product_id ? 'editGoodsDetils' : 'addGoodsSecoundData', val)
|
setStorage('editCommodity', val)
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
@ -214,12 +222,21 @@
|
|||||||
this.disModel = true;
|
this.disModel = true;
|
||||||
}
|
}
|
||||||
if (this.product_id) {
|
if (this.product_id) {
|
||||||
editGoodsDetils = getStorage('editGoodsDetils');
|
// editGoodsDetils = getStorage('editGoodsDetils');
|
||||||
|
editGoodsDetils = this.$store.state.storage.storage;
|
||||||
|
// console.log('ss',editGoodsDetils.content);
|
||||||
|
// editGoodsDetils = getStorage('editGoodsDetils');
|
||||||
|
// console.log('初始化商品详情',editGoodsDetils);
|
||||||
Object.keys(this.addGoodsSecoundData).forEach(item => {
|
Object.keys(this.addGoodsSecoundData).forEach(item => {
|
||||||
|
console.log(item, editGoodsDetils[item]);
|
||||||
this.addGoodsSecoundData[item] = editGoodsDetils[item];
|
this.addGoodsSecoundData[item] = editGoodsDetils[item];
|
||||||
});
|
});
|
||||||
|
|
||||||
if (editGoodsDetils.content) {
|
if (editGoodsDetils.content) {
|
||||||
|
this.goodsDis.imageList = editGoodsDetils.content.image;
|
||||||
|
this.goodsDis.store_name = editGoodsDetils.content.title;
|
||||||
|
this.store_name = editGoodsDetils.content.title;
|
||||||
|
// console.log(this.goodsDis, editGoodsDetils.content);
|
||||||
setStorage('goodsDis', {
|
setStorage('goodsDis', {
|
||||||
store_name: editGoodsDetils.content.title,
|
store_name: editGoodsDetils.content.title,
|
||||||
imageList: editGoodsDetils.content.image
|
imageList: editGoodsDetils.content.image
|
||||||
@ -228,6 +245,11 @@
|
|||||||
}
|
}
|
||||||
setStorage('canChangeSecound', true);
|
setStorage('canChangeSecound', true);
|
||||||
return;
|
return;
|
||||||
|
}else {
|
||||||
|
setStorage('goodsDis', {
|
||||||
|
store_name: '',
|
||||||
|
imageList: []
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getStorage('addGoodsSecoundData')) {
|
if (getStorage('addGoodsSecoundData')) {
|
||||||
@ -236,10 +258,6 @@
|
|||||||
this.addGoodsSecoundData[item] = getStorage('addGoodsSecoundData')[item];
|
this.addGoodsSecoundData[item] = getStorage('addGoodsSecoundData')[item];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
lastStep() {
|
lastStep() {
|
||||||
@ -514,7 +532,7 @@
|
|||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
padding: 8rpx;
|
padding: 8rpx;
|
||||||
background: #e93323;
|
background: #e93323;
|
||||||
z-index: 999;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
video {
|
video {
|
||||||
|
|||||||
@ -9,8 +9,8 @@
|
|||||||
placeholder-class="inputPlaceHolder" />
|
placeholder-class="inputPlaceHolder" />
|
||||||
</view>
|
</view>
|
||||||
<view class="input_content_textarea">
|
<view class="input_content_textarea">
|
||||||
<textarea v-model="setFormData.store_name" placeholder="请输入商品名称"
|
<textarea v-model="setFormData.store_name" placeholder="请输入商品名称" placeholder-class="placeholderStyle"
|
||||||
placeholder-class="placeholderStyle" maxlength="60" />
|
maxlength="60" />
|
||||||
<view>
|
<view>
|
||||||
<text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
|
<text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
|
||||||
<text v-else>0</text>
|
<text v-else>0</text>
|
||||||
@ -20,15 +20,13 @@
|
|||||||
<view class="photo_count">
|
<view class="photo_count">
|
||||||
<text class="photo_size">建议：图片尺寸为750*750px</text>
|
<text class="photo_size">建议：图片尺寸为750*750px</text>
|
||||||
<view class="input_content_photo">
|
<view class="input_content_photo">
|
||||||
<view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList"
|
<view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList" :key="index">
|
||||||
:key="index">
|
|
||||||
<image :src="item" class="myimg2 photos" @click="pop(item)"></image>
|
<image :src="item" class="myimg2 photos" @click="pop(item)"></image>
|
||||||
<view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
|
<view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
|
||||||
<image src="../static/images/close.png" mode=""></image>
|
<image src="../static/images/close.png" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn"
|
<view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn" @click="clk">
|
||||||
@click="clk">
|
|
||||||
<view>
|
<view>
|
||||||
<image src="../static/images/creamer.png" mode="widthFix"></image>
|
<image src="../static/images/creamer.png" mode="widthFix"></image>
|
||||||
</view>
|
</view>
|
||||||
@ -86,7 +84,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<priceComponent></priceComponent>
|
<priceComponent :product_id="product_id" v-if="showCommodity"></priceComponent>
|
||||||
|
|
||||||
<!-- <view class="popup_group">
|
<!-- <view class="popup_group">
|
||||||
<view class="radio">
|
<view class="radio">
|
||||||
@ -165,7 +163,8 @@
|
|||||||
</view> -->
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<commodityComponent :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
|
<commodityComponent v-if="showCommodity" :key="showCommodity" :showCommodity="showCommodity" :resetKey="secoundModel" :product_id="product_id" :merId="merId"
|
||||||
|
:code="code" @lastStep="lastStep">
|
||||||
</commodityComponent>
|
</commodityComponent>
|
||||||
|
|
||||||
<view class="popup_group">
|
<view class="popup_group">
|
||||||
@ -245,9 +244,8 @@
|
|||||||
|
|
||||||
<uni-popup ref="tempId" type="bottom">
|
<uni-popup ref="tempId" type="bottom">
|
||||||
<linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']"
|
<linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']"
|
||||||
:selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData"
|
:selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData" @multipleList="multipleList"
|
||||||
@multipleList="multipleList" @close="$refs.tempId.close()"
|
@close="$refs.tempId.close()" @scrolltolower="scrolltolower"></linkage-assembly>
|
||||||
@scrolltolower="scrolltolower"></linkage-assembly>
|
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
<uni-popup ref="attr" type="bottom">
|
<uni-popup ref="attr" type="bottom">
|
||||||
<attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr">
|
<attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr">
|
||||||
@ -307,6 +305,7 @@
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
showCommodity: false, // 是否显示商品,售价
|
||||||
step: 1,
|
step: 1,
|
||||||
bar_code: '',
|
bar_code: '',
|
||||||
bar_code_dis: false,
|
bar_code_dis: false,
|
||||||
@ -429,6 +428,7 @@
|
|||||||
// console.log(opt);
|
// console.log(opt);
|
||||||
this.merId = Number(opt.mer_id);
|
this.merId = Number(opt.mer_id);
|
||||||
this.product_id = opt.product_id;
|
this.product_id = opt.product_id;
|
||||||
|
if(!opt.product_id)this.showCommodity=true;
|
||||||
if (opt.code) {
|
if (opt.code) {
|
||||||
this.code = opt.code;
|
this.code = opt.code;
|
||||||
this.bar_code_dis = true
|
this.bar_code_dis = true
|
||||||
@ -437,8 +437,20 @@
|
|||||||
// this.getDeliveryType();
|
// this.getDeliveryType();
|
||||||
if (this.product_id) {
|
if (this.product_id) {
|
||||||
this.initDataEditData();
|
this.initDataEditData();
|
||||||
|
}else {
|
||||||
|
setStorage('editCommodity',{});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
onBackPress() {
|
||||||
|
let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
|
||||||
|
'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound', 'editCommodity'
|
||||||
|
];
|
||||||
|
waitDeleteData.forEach(item => {
|
||||||
|
if (getStorage(item)) {
|
||||||
|
removeStorage(item);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
this.setFormData.setSpecificaValue = '';
|
this.setFormData.setSpecificaValue = '';
|
||||||
this.setFormData.setSpecificaValue2 = '';
|
this.setFormData.setSpecificaValue2 = '';
|
||||||
@ -480,6 +492,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
//图片预览
|
//图片预览
|
||||||
pop(e) {
|
pop(e) {
|
||||||
this.show = true
|
this.show = true
|
||||||
@ -573,6 +586,8 @@
|
|||||||
}
|
}
|
||||||
productDetail(this.merId, this.product_id).then(res => {
|
productDetail(this.merId, this.product_id).then(res => {
|
||||||
setStorage('editGoodsDetils', res.data);
|
setStorage('editGoodsDetils', res.data);
|
||||||
|
if(res.data.content_arr) res.data.content = res.data.content_arr;
|
||||||
|
this.$store.commit('setStorage', res.data);
|
||||||
let editGoodsDetils = res.data;
|
let editGoodsDetils = res.data;
|
||||||
Object.keys(this.setFormData).forEach(item => {
|
Object.keys(this.setFormData).forEach(item => {
|
||||||
this.setFormData[item] = editGoodsDetils[item];
|
this.setFormData[item] = editGoodsDetils[item];
|
||||||
@ -606,6 +621,8 @@
|
|||||||
editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
|
editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
|
||||||
setStorage('canChange', true);
|
setStorage('canChange', true);
|
||||||
hideLoading();
|
hideLoading();
|
||||||
|
this.showCommodity = true;
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 选择图片
|
// 选择图片
|
||||||
@ -613,7 +630,6 @@
|
|||||||
let that = this;
|
let that = this;
|
||||||
that.$util.uploadImageOne('upload/image', function(res) {
|
that.$util.uploadImageOne('upload/image', function(res) {
|
||||||
that.setFormData.imageList.push(res.data.path);
|
that.setFormData.imageList.push(res.data.path);
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
clk() {
|
clk() {
|
||||||
@ -915,10 +931,10 @@
|
|||||||
.pop {
|
.pop {
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.guanbi {
|
.guanbi {
|
||||||
width: 20px;
|
width: 20px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
margin: 30px auto;
|
margin: 30px auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
@ -1,6 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<select-form style="border-radius: 10rpx 10rpx 0 0;" :platformClassification="formList" :form="singleSpecification" @input="input"></select-form>
|
<select-form style="border-radius: 10rpx 10rpx 0 0;" :platformClassification="formList" :form="singleSpecification"
|
||||||
|
@input="input"></select-form>
|
||||||
<view class="more_than" @click="moreThanFlag?selectMoreThan():spliceMoreThan()">
|
<view class="more_than" @click="moreThanFlag?selectMoreThan():spliceMoreThan()">
|
||||||
<view v-if="moreThanFlag">更多</view>
|
<view v-if="moreThanFlag">更多</view>
|
||||||
<view v-else>收起</view>
|
<view v-else>收起</view>
|
||||||
@ -21,11 +22,13 @@
|
|||||||
components: {
|
components: {
|
||||||
selectForm
|
selectForm
|
||||||
},
|
},
|
||||||
|
props: ['product_id'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
singleSpecification: {
|
singleSpecification: {
|
||||||
price: '', // 售价
|
price: '', // 售价
|
||||||
cost: '', // 成本价
|
cost: '', // 成本价
|
||||||
|
stock: '', // 库存
|
||||||
ot_price: '', // 原价
|
ot_price: '', // 原价
|
||||||
bar_code: '', // 商品编号
|
bar_code: '', // 商品编号
|
||||||
weight: '', // 重量
|
weight: '', // 重量
|
||||||
@ -35,24 +38,21 @@
|
|||||||
extension_two: ''
|
extension_two: ''
|
||||||
},
|
},
|
||||||
moreThanFlag: true,
|
moreThanFlag: true,
|
||||||
formList: [
|
formList: [{
|
||||||
{
|
|
||||||
id: 1,
|
id: 1,
|
||||||
label: '售价',
|
label: '售价',
|
||||||
type: 'digit',
|
type: 'digit',
|
||||||
model: 'price',
|
model: 'price',
|
||||||
holder: '请填写售价'
|
holder: '请填写售价'
|
||||||
},
|
}, {
|
||||||
{
|
id: 10,
|
||||||
id: 0,
|
|
||||||
label: '库存',
|
label: '库存',
|
||||||
type: 'digit',
|
type: 'digit',
|
||||||
model: 'stock_num',
|
model: 'stock',
|
||||||
holder: '请填写库存'
|
holder: '请填写库存',
|
||||||
},
|
disable: true
|
||||||
],
|
}],
|
||||||
moreThanList: [
|
moreThanList: [{
|
||||||
{
|
|
||||||
id: 2,
|
id: 2,
|
||||||
label: '成本价',
|
label: '成本价',
|
||||||
type: 'digit',
|
type: 'digit',
|
||||||
@ -137,6 +137,31 @@
|
|||||||
// key: 'singleSpecification'
|
// key: 'singleSpecification'
|
||||||
// });
|
// });
|
||||||
// },
|
// },
|
||||||
|
mounted() {
|
||||||
|
if (getStorage('addGoodsFormData').image) {
|
||||||
|
this.singleSpecification.image = getStorage('addGoodsFormData').image;
|
||||||
|
}
|
||||||
|
if (getStorage('singleSpecification')) {
|
||||||
|
Object.keys(this.singleSpecification).forEach(item => {
|
||||||
|
if (getStorage('singleSpecification')[item]) {
|
||||||
|
this.singleSpecification[item] = getStorage('singleSpecification')[item]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
// if (!this.$props.product_id) {
|
||||||
|
// this.formList.push({
|
||||||
|
// id: 10,
|
||||||
|
// label: '库存',
|
||||||
|
// type: 'digit',
|
||||||
|
// model: 'stock',
|
||||||
|
// holder: '请填写库存',
|
||||||
|
// disable: true
|
||||||
|
// })
|
||||||
|
// }
|
||||||
|
},
|
||||||
|
destroyed() {
|
||||||
|
setStorage('singleSpecification', {});
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
selectMoreThan() {
|
selectMoreThan() {
|
||||||
this.formList = this.formList.concat(this.moreThanList);
|
this.formList = this.formList.concat(this.moreThanList);
|
||||||
@ -144,6 +169,7 @@
|
|||||||
},
|
},
|
||||||
spliceMoreThan() {
|
spliceMoreThan() {
|
||||||
this.moreThanFlag = true;
|
this.moreThanFlag = true;
|
||||||
|
// this.formList.splice(!this.$props.product_id ? 2 : 1, this.formList.length);
|
||||||
this.formList.splice(2, this.formList.length);
|
this.formList.splice(2, this.formList.length);
|
||||||
},
|
},
|
||||||
input(val) {
|
input(val) {
|
||||||
@ -162,6 +188,7 @@
|
|||||||
.container {
|
.container {
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.more_than {
|
.more_than {
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
border-radius: 0 0 10rpx 10rpx;
|
border-radius: 0 0 10rpx 10rpx;
|
||||||
@ -187,6 +214,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
||||||
.button {
|
.button {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@ -57,7 +57,8 @@
|
|||||||
<video :src="addGoodsSecoundData.video_link"></video>
|
<video :src="addGoodsSecoundData.video_link"></video>
|
||||||
<!--#endif-->
|
<!--#endif-->
|
||||||
<!--#ifdef APP-PLUS-->
|
<!--#ifdef APP-PLUS-->
|
||||||
<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png" style=" width:150rpx" ></img>
|
<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
|
||||||
|
style=" width:150rpx"></img>
|
||||||
<!--#endif-->
|
<!--#endif-->
|
||||||
<image src="../static/images/close.png" mode="widthFix"></image>
|
<image src="../static/images/close.png" mode="widthFix"></image>
|
||||||
</view>
|
</view>
|
||||||
@ -241,7 +242,7 @@
|
|||||||
submitCreatedGoods() {
|
submitCreatedGoods() {
|
||||||
Loading();
|
Loading();
|
||||||
let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
|
let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
|
||||||
'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound'
|
'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound', 'editCommodity'
|
||||||
];
|
];
|
||||||
let attrValue = getStorage('addGoodsFormData').spec_type == 0 ? [getStorage('singleSpecification')] :
|
let attrValue = getStorage('addGoodsFormData').spec_type == 0 ? [getStorage('singleSpecification')] :
|
||||||
getStorage('attrValue');
|
getStorage('attrValue');
|
||||||
@ -254,12 +255,25 @@
|
|||||||
},
|
},
|
||||||
video_link: this.addGoodsSecoundData.video_link
|
video_link: this.addGoodsSecoundData.video_link
|
||||||
};
|
};
|
||||||
|
|
||||||
if (attrValue) {
|
if (attrValue) {
|
||||||
postData.attrValue = attrValue.filter(item => item != '');
|
postData.attrValue = attrValue.filter(item => item != '');
|
||||||
postData.attrValue[0].bar_code
|
postData.attrValue[0].bar_code
|
||||||
}
|
}
|
||||||
|
let info = getStorage('editCommodity');
|
||||||
|
Object.keys(info).forEach(key=>{
|
||||||
|
postData[key]=info[key];
|
||||||
|
})
|
||||||
|
postData.stock = postData.attrValue[0].stock;
|
||||||
// console.log(postData);
|
// console.log(postData);
|
||||||
|
if(!postData.store_name||postData.store_name?.trim().length<=0)return Toast('请输入商品名称');
|
||||||
|
if(!postData.imageList||postData.imageList.length<=0)return Toast('请上传商品图片');
|
||||||
|
if(postData.cate_name?.trim().length<=0)return Toast('请选择平台分类');
|
||||||
|
if(postData.unit_name?.trim().length<=0)return Toast('请输入商品单位');
|
||||||
|
if(!postData.attrValue[0].price||postData.attrValue[0].price<0)return Toast('价格不能小于0');
|
||||||
|
if(!postData.stock||postData.stock<0)return Toast('库存不能小于0');
|
||||||
|
if(!postData.content.title||postData.content.title?.trim().length<=0)return Toast('请输入商品详情');
|
||||||
|
if(!postData.content.image||postData.content.image?.length<=0)return Toast('请上传商品图片');
|
||||||
|
// return Toast('通过');
|
||||||
if (getStorage('addGoodsFormData').spec_type == 0) {
|
if (getStorage('addGoodsFormData').spec_type == 0) {
|
||||||
// postData.attr = [getStorage('singleSpecification')];
|
// postData.attr = [getStorage('singleSpecification')];
|
||||||
}
|
}
|
||||||
@ -419,6 +433,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.videoHover {
|
.videoHover {
|
||||||
width: 180rpx;
|
width: 180rpx;
|
||||||
height: 180rpx;
|
height: 180rpx;
|
||||||
@ -445,6 +460,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.photo {
|
.photo {
|
||||||
border: 1px solid #dddddd;
|
border: 1px solid #dddddd;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
@ -487,10 +503,12 @@
|
|||||||
height: 150rpx;
|
height: 150rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.preview_video {
|
.preview_video {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.container_input {
|
.container_input {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
padding: 0 20rpx;
|
padding: 0 20rpx;
|
||||||
@ -609,6 +627,7 @@
|
|||||||
.marginTop_none {
|
.marginTop_none {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.video-count {
|
.video-count {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
width: 600rpx;
|
width: 600rpx;
|
||||||
@ -627,6 +646,7 @@
|
|||||||
height: 500rpx;
|
height: 500rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// .writeBg {
|
// .writeBg {
|
||||||
// background: #fff;
|
// background: #fff;
|
||||||
// }
|
// }
|
||||||
|
|||||||
@ -75,8 +75,10 @@
|
|||||||
<text class="sub_title">配送方式：</text>
|
<text class="sub_title">配送方式：</text>
|
||||||
<view class="flex">
|
<view class="flex">
|
||||||
<checkbox-group name="" @change="checkboxChange">
|
<checkbox-group name="" @change="checkboxChange">
|
||||||
<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提(加入供应链)</text>
|
<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text
|
||||||
<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text class="text">快递配送</text>
|
class="text ziti">到店自提(加入供应链)</text>
|
||||||
|
<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text
|
||||||
|
class="text">快递配送</text>
|
||||||
</checkbox-group>
|
</checkbox-group>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -110,10 +112,12 @@
|
|||||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
|
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
|
||||||
<view class="bus_time flex_a_c">
|
<view class="bus_time flex_a_c">
|
||||||
<view class="select" @click="beginTimeShow = true">
|
<view class="select" @click="beginTimeShow = true">
|
||||||
{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}</view>
|
{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
|
||||||
|
</view>
|
||||||
至
|
至
|
||||||
<view class="select" @click="overTimeShow = true">
|
<view class="select" @click="overTimeShow = true">
|
||||||
{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view>
|
{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -31,7 +31,8 @@
|
|||||||
<text v-else>0</text>/200
|
<text v-else>0</text>/200
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="input_content_describe_textarea"><textarea v-model="prodectContent.store_info" value=""
|
<view class="input_content_describe_textarea">
|
||||||
|
<textarea v-model="prodectContent.store_info" value=""
|
||||||
placeholder="请填写商品简介" placeholderClass="placeholderClass" maxlength="200" /></view>
|
placeholder="请填写商品简介" placeholderClass="placeholderClass" maxlength="200" /></view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@ -110,7 +111,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
// console.log(this.$props.prodectContent);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleChooseImage() {
|
handleChooseImage() {
|
||||||
@ -142,10 +143,11 @@
|
|||||||
[TOKENNAME]: 'Bearer ' + store.state.app.token
|
[TOKENNAME]: 'Bearer ' + store.state.app.token
|
||||||
},
|
},
|
||||||
success: (uploadFileRes) => {
|
success: (uploadFileRes) => {
|
||||||
// console.log(uploadFileRes.data);
|
// console.log(JSON.parse(uploadFileRes.data));
|
||||||
let imgData = JSON.parse(uploadFileRes.data)
|
let imgData = JSON.parse(uploadFileRes.data)
|
||||||
// that.prodectContent.imageList.push(imgData.data.path)
|
// that.prodectContent.imageList.push(imgData.data.path)
|
||||||
that.prodectContent = { imageList: [...that.prodectContent.imageList, imgData.data.path] ,store_name:this.upstore}
|
if(!that.prodectContent.imageList)that.prodectContent.imageList=[];
|
||||||
|
that.prodectContent = { imageList: [...that.prodectContent.imageList, imgData.data.path] ,store_name:this.upstore};
|
||||||
},
|
},
|
||||||
complete(res) {
|
complete(res) {
|
||||||
// console.log(res)
|
// console.log(res)
|
||||||
|
|||||||
@ -490,7 +490,6 @@
|
|||||||
that.loading = false;
|
that.loading = false;
|
||||||
that.loaded = res.data.list.length < that.where.limit;
|
that.loaded = res.data.list.length < that.where.limit;
|
||||||
that.productList.push.apply(that.productList, res.data.list);
|
that.productList.push.apply(that.productList, res.data.list);
|
||||||
|
|
||||||
that.where.page = that.where.page + 1;
|
that.where.page = that.where.page + 1;
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
@ -226,7 +226,8 @@
|
|||||||
<text class="count">{{item.relevance.length}}</text>
|
<text class="count">{{item.relevance.length}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="showManage == item.author.uid || showManage " class="manage" :style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
|
<view v-if="showManage == item.author.uid || showManage " class="manage"
|
||||||
|
:style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
|
||||||
<view class="manage-gou"></view>
|
<view class="manage-gou"></view>
|
||||||
<navigator hover-class="none"
|
<navigator hover-class="none"
|
||||||
:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
|
:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
|
||||||
@ -309,7 +310,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
<!-- 他提到的宝贝弹窗 -->
|
<!-- 他提到的宝贝弹窗 -->
|
||||||
<uni-popup type="bottom" ref="pinglunMentioned" style="background-color: rebeccapurple;">
|
<uni-popup type="bottom" ref="pinglunMentioned">
|
||||||
|
|
||||||
|
|
||||||
<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
|
<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
|
||||||
@ -361,6 +362,7 @@
|
|||||||
import {
|
import {
|
||||||
navigateBack
|
navigateBack
|
||||||
} from '../../../libs/uniApi';
|
} from '../../../libs/uniApi';
|
||||||
|
import list from '../../../uni_modules/uview-ui/libs/config/props/list';
|
||||||
export default {
|
export default {
|
||||||
computed: configMap({
|
computed: configMap({
|
||||||
statusBarHeight: 0,
|
statusBarHeight: 0,
|
||||||
@ -718,6 +720,7 @@
|
|||||||
// });
|
// });
|
||||||
// })'
|
// })'
|
||||||
// that.isUser ?
|
// that.isUser ?
|
||||||
|
|
||||||
videoList({
|
videoList({
|
||||||
page: that.page,
|
page: that.page,
|
||||||
limit: that.limit,
|
limit: that.limit,
|
||||||
@ -896,11 +899,43 @@
|
|||||||
// if(!this.loadVideo) return
|
// if(!this.loadVideo) return
|
||||||
this.loadVideo = true
|
this.loadVideo = true
|
||||||
// 这个方法主要就是用来第一次进入视频播放时用来处理
|
// 这个方法主要就是用来第一次进入视频播放时用来处理
|
||||||
deoList(this.videoID).then(async (res) => {
|
// deoList(this.videoID).then(async (res) => {
|
||||||
|
// this.loadVideo = false
|
||||||
|
// this.userUid = res.data.uid
|
||||||
|
// this.page = 1;
|
||||||
|
// var msg = [res.data];
|
||||||
|
// for (let i = 0; i < msg.length; i++) {
|
||||||
|
// msg[i]['isMore'] = false
|
||||||
|
// msg[i]['playIng'] = false
|
||||||
|
// msg[i]['state'] = false
|
||||||
|
// msg[i]['isplay'] = false
|
||||||
|
// msg[i]['loading'] = false
|
||||||
|
// msg[i]['community_id'] = msg[i]['community_id'].toString()
|
||||||
|
// }
|
||||||
|
// this.dataList = msg;
|
||||||
|
|
||||||
|
// if (this.dataList.length !== 0) {
|
||||||
|
// this.dataList[this.k].state = 'play';
|
||||||
|
// uni.createVideoContext(this.dataList[this.k].community_id, this).play()
|
||||||
|
// }
|
||||||
|
// }).catch(err => {
|
||||||
|
// return uni.showToast({
|
||||||
|
// title: err,
|
||||||
|
// icon: 'none',
|
||||||
|
// duration: 2000
|
||||||
|
// });
|
||||||
|
// })
|
||||||
|
|
||||||
|
videoList({
|
||||||
|
page: this.page,
|
||||||
|
limit: this.limit,
|
||||||
|
id: this.videoID
|
||||||
|
}).then(async (res) => {
|
||||||
|
|
||||||
this.loadVideo = false
|
this.loadVideo = false
|
||||||
this.userUid = res.data.uid
|
this.userUid = res.data.uid
|
||||||
this.page = this.page + 1;
|
|
||||||
var msg = [res.data];
|
var msg =res.data.list;
|
||||||
for (let i = 0; i < msg.length; i++) {
|
for (let i = 0; i < msg.length; i++) {
|
||||||
msg[i]['isMore'] = false
|
msg[i]['isMore'] = false
|
||||||
msg[i]['playIng'] = false
|
msg[i]['playIng'] = false
|
||||||
@ -914,6 +949,7 @@
|
|||||||
if (this.dataList.length !== 0) {
|
if (this.dataList.length !== 0) {
|
||||||
this.dataList[this.k].state = 'play';
|
this.dataList[this.k].state = 'play';
|
||||||
uni.createVideoContext(this.dataList[this.k].community_id, this).play()
|
uni.createVideoContext(this.dataList[this.k].community_id, this).play()
|
||||||
|
this.page = that.page + 1
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
return uni.showToast({
|
return uni.showToast({
|
||||||
@ -924,7 +960,6 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// this.isUser ?
|
// this.isUser ?
|
||||||
// myVideoList(this.userUid, {
|
// myVideoList(this.userUid, {
|
||||||
// page: this.page,
|
// page: this.page,
|
||||||
@ -1113,7 +1148,6 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
// .video-list{
|
// .video-list{
|
||||||
// padding: 200rpx 28.07rpx 0 28.07rpx;
|
// padding: 200rpx 28.07rpx 0 28.07rpx;
|
||||||
// display: flex;
|
// display: flex;
|
||||||
@ -1268,6 +1302,7 @@
|
|||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
padding-right: 30rpx;
|
padding-right: 30rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -190,6 +190,9 @@
|
|||||||
uni.hideKeyboard();
|
uni.hideKeyboard();
|
||||||
}else{
|
}else{
|
||||||
that.getUserInfo();
|
that.getUserInfo();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
@ -227,7 +230,8 @@
|
|||||||
let reply_id = that.reply_id ? that.reply_id : 0
|
let reply_id = that.reply_id ? that.reply_id : 0
|
||||||
replyCreateApi(that.id,{content: that.content,reply_id: reply_id}).then(res => {
|
replyCreateApi(that.id,{content: that.content,reply_id: reply_id}).then(res => {
|
||||||
// console.log(res.message)
|
// console.log(res.message)
|
||||||
if(res.status == 1){
|
// console.log(res)
|
||||||
|
if(res.status == 200){
|
||||||
if(that.isChild){
|
if(that.isChild){
|
||||||
if(that.list[that.index]['children']){
|
if(that.list[that.index]['children']){
|
||||||
that.list[that.index]['children'].push(res.data)
|
that.list[that.index]['children'].push(res.data)
|
||||||
@ -472,7 +476,7 @@
|
|||||||
.send{
|
.send{
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
padding: 12rpx 30rpx;
|
padding: 15rpx 30rpx;
|
||||||
background: #E93323;
|
background: #E93323;
|
||||||
border-radius: 30rpx;
|
border-radius: 30rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|||||||
@ -435,7 +435,9 @@
|
|||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
k(new_k, old_k) {
|
k(new_k, old_k) {
|
||||||
|
|
||||||
const max = new_k + 2;
|
const max = new_k + 2;
|
||||||
|
|
||||||
if (this.max < max) {
|
if (this.max < max) {
|
||||||
this.max = max;
|
this.max = max;
|
||||||
}
|
}
|
||||||
@ -451,7 +453,7 @@
|
|||||||
uni.createVideoContext(this.dataList[old_k].community_id + '' + old_k, this)
|
uni.createVideoContext(this.dataList[old_k].community_id + '' + old_k, this)
|
||||||
.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
|
.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
|
||||||
// console.log('已经暂停 --> 第' + (old_k + 1) + '个视频～') //提示
|
// console.log('已经暂停 --> 第' + (old_k + 1) + '个视频～') //提示
|
||||||
// #ifdef MP
|
|
||||||
this.dataList[new_k].state = 'play'
|
this.dataList[new_k].state = 'play'
|
||||||
this.dataList[new_k].isplay = false
|
this.dataList[new_k].isplay = false
|
||||||
this.dataList[new_k].playIng = true
|
this.dataList[new_k].playIng = true
|
||||||
@ -461,7 +463,7 @@
|
|||||||
}, 250)
|
}, 250)
|
||||||
}
|
}
|
||||||
this.videoShare(this.dataList[new_k])
|
this.videoShare(this.dataList[new_k])
|
||||||
// #endif
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(options) {
|
onLoad(options) {
|
||||||
@ -504,7 +506,7 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
//#ifdef MP
|
|
||||||
videoShare(item) {
|
videoShare(item) {
|
||||||
if (item && item.status == 1) {
|
if (item && item.status == 1) {
|
||||||
let uid = this.uid ? this.uid : 0;
|
let uid = this.uid ? this.uid : 0;
|
||||||
@ -520,7 +522,7 @@
|
|||||||
uni.hideShareMenu()
|
uni.hideShareMenu()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// #endif
|
|
||||||
goBack: function() {
|
goBack: function() {
|
||||||
uni.navigateBack();
|
uni.navigateBack();
|
||||||
},
|
},
|
||||||
@ -752,21 +754,21 @@
|
|||||||
let that = this
|
let that = this
|
||||||
|
|
||||||
// 1.这里引入后端请求数据
|
// 1.这里引入后端请求数据
|
||||||
if (that.videoshow) {
|
// if (that.videoshow) {
|
||||||
deoList(this.videoID).then(res => {
|
// deoList(this.videoID).then(res => {
|
||||||
that.videoData([res.data])
|
// that.videoData([res.data])
|
||||||
if (res.data.list.length < that.limit) {
|
// if (res.data.list.length < that.limit) {
|
||||||
this.loadMore = false;
|
// this.loadMore = false;
|
||||||
}
|
// }
|
||||||
}).catch(err => {
|
// }).catch(err => {
|
||||||
return uni.showToast({
|
// return uni.showToast({
|
||||||
title: err,
|
// title: err,
|
||||||
icon: 'none',
|
// icon: 'none',
|
||||||
duration: 2000
|
// duration: 2000
|
||||||
});
|
// });
|
||||||
})
|
// })
|
||||||
this.videoshow = false
|
// this.videoshow = false
|
||||||
} else {
|
// } else {
|
||||||
// videoList().then(res=>{
|
// videoList().then(res=>{
|
||||||
// that.videoData(res.data.list);
|
// that.videoData(res.data.list);
|
||||||
// })
|
// })
|
||||||
@ -788,7 +790,7 @@
|
|||||||
duration: 2000
|
duration: 2000
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
}
|
// }
|
||||||
|
|
||||||
// that.isUser ?
|
// that.isUser ?
|
||||||
// myVideoList(that.userUid, {
|
// myVideoList(that.userUid, {
|
||||||
@ -851,7 +853,9 @@
|
|||||||
this.communityId = list[0]['community_id']
|
this.communityId = list[0]['community_id']
|
||||||
if (list.length == 0) return
|
if (list.length == 0) return
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
||||||
that.page = that.page + 1;
|
that.page = that.page + 1;
|
||||||
|
|
||||||
var msg = list
|
var msg = list
|
||||||
// 2.这里把视频添加到视频列表
|
// 2.这里把视频添加到视频列表
|
||||||
for (let i = 0; i < msg.length; i++) {
|
for (let i = 0; i < msg.length; i++) {
|
||||||
@ -861,15 +865,21 @@
|
|||||||
msg[i]['isplay'] = true
|
msg[i]['isplay'] = true
|
||||||
msg[i]['loading'] = false
|
msg[i]['loading'] = false
|
||||||
that.dataList.push(msg[i])
|
that.dataList.push(msg[i])
|
||||||
//#ifndef H5
|
|
||||||
|
|
||||||
|
console.log(i, that.k)
|
||||||
if (i == 0 && that.k == 0) {
|
if (i == 0 && that.k == 0) {
|
||||||
this.dataList[0].isplay = false
|
this.dataList[0].isplay = false
|
||||||
this.dataList[0].playIng = true
|
this.dataList[0].playIng = true
|
||||||
this.dataList[0].state = 'play'
|
this.dataList[0].state = 'play'
|
||||||
this.dataList[0].loading = false
|
this.dataList[0].loading = false
|
||||||
|
setTimeout(() => {
|
||||||
uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
|
uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
|
||||||
|
// uni.createVideoContext(this.dataList[new_k].community_id + '' + new_k, this).play()
|
||||||
|
}, 250)
|
||||||
|
|
||||||
}
|
}
|
||||||
//#endif
|
|
||||||
}
|
}
|
||||||
//#ifdef MP
|
//#ifdef MP
|
||||||
if (this.k == 0) {
|
if (this.k == 0) {
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 944 B After Width: | Height: | Size: 944 B |
|
Before Width: | Height: | Size: 747 B After Width: | Height: | Size: 747 B |
@ -1010,6 +1010,7 @@
|
|||||||
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
|
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
|
||||||
} else {
|
} else {
|
||||||
this.tabs = this.tabs5
|
this.tabs = this.tabs5
|
||||||
|
this.type=7
|
||||||
}
|
}
|
||||||
|
|
||||||
this.tab(this.type)
|
this.tab(this.type)
|
||||||
|
|||||||
@ -283,6 +283,12 @@
|
|||||||
去付款
|
去付款
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
|
<block v-if="item.order_status == 2 ">
|
||||||
|
|
||||||
|
<view class='bnt b-color' @click.stop='goOrderDetails(item.order_id)'>
|
||||||
|
去发货
|
||||||
|
</view>
|
||||||
|
</block>
|
||||||
<block v-if="item.order_status == 9 ">
|
<block v-if="item.order_status == 9 ">
|
||||||
|
|
||||||
<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
|
<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
|
||||||
|
|||||||
@ -272,15 +272,20 @@
|
|||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: res.message
|
title: res.message
|
||||||
})
|
})
|
||||||
|
if(res.data.status='error'){
|
||||||
|
|
||||||
|
}else{
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
uni.navigateTo({
|
uni.navigateBack({
|
||||||
url:'/pages/users/order_list/index?status=2'
|
delta: 2
|
||||||
})
|
})
|
||||||
}, 1000)
|
}, 1000)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// setTimeout(() => {
|
// setTimeout(() => {
|
||||||
// uni.navigateBack({
|
// uni.navigateBack({
|
||||||
// delta: 1
|
// delta: 1
|
||||||
|
|||||||
@ -118,19 +118,19 @@
|
|||||||
payStatus: true
|
payStatus: true
|
||||||
}
|
}
|
||||||
// #ifdef H5 ||APP-PLUS
|
// #ifdef H5 ||APP-PLUS
|
||||||
,
|
// ,
|
||||||
{
|
// {
|
||||||
name: '支付宝支付',
|
// name: '支付宝支付',
|
||||||
icon: 'icon-zhifubao',
|
// icon: 'icon-zhifubao',
|
||||||
// #ifdef H5 || APP-PLUS
|
// // #ifdef H5 || APP-PLUS
|
||||||
value: 'alipay',
|
// value: 'alipay',
|
||||||
// #endif
|
// // #endif
|
||||||
// #ifdef MP
|
// // #ifdef MP
|
||||||
value: 'alipayQr',
|
// value: 'alipayQr',
|
||||||
// #endif
|
// // #endif
|
||||||
title: '支付宝支付',
|
// title: '支付宝支付',
|
||||||
payStatus: true
|
// payStatus: true
|
||||||
}
|
// }
|
||||||
// #endif
|
// #endif
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|||||||
26
static/iconfont/demo.css
Normal file
26
static/iconfont/demo.css
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
/* Logo 字体 */
|
||||||
|
@font-face {
|
||||||
|
font-family: "iconfont";
|
||||||
|
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
|
||||||
|
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
|
||||||
|
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
|
||||||
|
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
|
||||||
|
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
|
||||||
|
}
|
||||||
|
|
||||||
|
.iconfont {
|
||||||
|
font-family: "iconfont" !important;
|
||||||
|
font-size: 16px;
|
||||||
|
font-style: normal;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-dianzan2:before {
|
||||||
|
content: "\e61f";
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-dianzan3:before {
|
||||||
|
content: "\e601";
|
||||||
|
}
|
||||||
|
|
||||||
@ -8,6 +8,8 @@
|
|||||||
// | Author: CRMEB Team <admin@crmeb.com>
|
// | Author: CRMEB Team <admin@crmeb.com>
|
||||||
// +----------------------------------------------------------------------
|
// +----------------------------------------------------------------------
|
||||||
import app from "./app";
|
import app from "./app";
|
||||||
|
import storage from "./storage.js";
|
||||||
export default {
|
export default {
|
||||||
app
|
app,
|
||||||
|
storage
|
||||||
};
|
};
|
||||||
|
|||||||
29
store/modules/storage.js
Normal file
29
store/modules/storage.js
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import {
|
||||||
|
getUserInfo,
|
||||||
|
Appversion
|
||||||
|
} from "../../api/user.js";
|
||||||
|
import {
|
||||||
|
LOGIN_STATUS,
|
||||||
|
UID,
|
||||||
|
USER_INFO
|
||||||
|
} from '../../config/cache';
|
||||||
|
import Cache from '../../utils/cache';
|
||||||
|
|
||||||
|
const state = {
|
||||||
|
storage: {},
|
||||||
|
};
|
||||||
|
|
||||||
|
const mutations = {
|
||||||
|
setStorage(state, data) {
|
||||||
|
state.storage = data;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const actions = {
|
||||||
|
};
|
||||||
|
|
||||||
|
export default {
|
||||||
|
state,
|
||||||
|
mutations,
|
||||||
|
actions
|
||||||
|
};
|
||||||
@ -50,5 +50,10 @@ export const initEvent = () => {
|
|||||||
console.log('Host sendEvent: ' + JSON.stringify(ret));
|
console.log('Host sendEvent: ' + JSON.stringify(ret));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
if (ret.event == 'log') {
|
||||||
|
// console.log('2222222')
|
||||||
|
|
||||||
|
console.log('收到小程序事件: ' + JSON.stringify(ret));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user