共{{item.refundOrder.refund_num}}件商品，
合计 ￥{{ item.refundOrder.refund_price }}
@@ -571,7 +589,8 @@
@@ -1212,8 +1236,7 @@
let self = this
self.$util.uploadImageOne('upload/image', function(res) {
if (res.status == 200) {
- self.sendMsg(res.data.path, 3
- )
+ self.sendMsg(res.data.path, 3)
}
});
},
@@ -1603,7 +1626,7 @@
margin-top: 20rpx;
width: 710rpx;
position: fixed;
- bottom: 120rpx;
+ bottom: 160rpx;
left: 20rpx;
.broadcast-details_box,
@@ -1790,6 +1813,7 @@
.broadcast-details .chat .item .text {
margin-left: 20rpx;
+
}
.broadcast-details .chat .item .text.textR {
@@ -1943,19 +1967,23 @@
transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
background-color: #fff;
position: fixed;
- bottom: 0;
+ bottom:var(--status-bar-height);
left: 0;
- margin-bottom: var(--status-bar-height);;
+
+
+
}
.broadcast-details .footerCon.on {
position: relative;
- top: -300rpx;
+ top: -360rpx;
+
transform: translate3d(0, 0, 0) !important;
}
.broadcast-details .footerCon .banner {
background: #fff;
+ padding-top: var(--status-bar-height);
}
.broadcast-details .footerCon .banner .swiper-slide {
@@ -1971,7 +1999,7 @@
display: block;
width: 50rpx;
height: 50rpx;
- margin: 40rpx 0 0 50rpx;
+ margin: 20rpx 0 0 40rpx;
}
.broadcast-details .footerCon .banner .swiper-container-horizontal>.swiper-pagination-bullets {
@@ -1980,6 +2008,10 @@
.broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
background-color: #999;
+
+
+
+
}
.broadcast-details .recording {
@@ -2036,6 +2068,8 @@
padding: 0 80rpx 0 30rpx;
height: 76rpx;
position: relative;
+
+
}
.broadcast-details .footer .placeholder {
@@ -2064,7 +2098,9 @@
display: inline-block;
width: 50rpx;
height: 50rpx;
- margin: 40rpx 0 0 50rpx;
+
+
+ margin: 20rpx 0 0 40rpx;
}
.emoji-outer {
diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index 27e017d..1a81af1 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -5,9 +5,10 @@
-
-
+
+
+
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 3cf0d27..dc3c98c 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -109,8 +109,8 @@
-
- 查看TA提到的宝贝(2)
+
+ 查看TA提到的宝贝({{objinfo.product_list.length}})
@@ -124,7 +124,7 @@
-
+
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 729a4b2..f3443be 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -227,6 +227,7 @@
import emptyPage from '@/components/emptyPage.vue';
import {
entrustlist,
+ addEntrustCart,
finishchain,
checkchain
} from '@/api/sale.js'
@@ -365,9 +366,25 @@
},
//下单
order(item) {
- uni.navigateTo({
- url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
- })
+ // uni.navigateTo({
+ // 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) {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index d7a9b0c..9be2728 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -141,8 +141,8 @@
AllMenuList: [{
name: '商户平台',
icon: '/static/applet/shop_app.png',
- // data: "__UNI__1EE148C",
- data: '/pages/moreProject/moreProject',
+ data: "__UNI__1EE148C",
+
type: 2,
},
{
@@ -359,7 +359,9 @@
break;
// case 2: uniMP.loadMPx(data); break;
case 2:
- this.navigator(data);
+ // this.navigator(data);
+ uniMP.loadMPx(data);
+
break;
case 3:
@@ -370,14 +372,14 @@
// #endif
// #ifdef H5
- if (type == 2) {
- this.navigator(data);
- } else {
+ // if (type == 2) {
+ // this.navigator(`/pages/moreProject/moreProject`);
+ // } else {
uni.showToast({
icon: 'none',
title: 'H5不支持打开小程序'
})
- }
+ // }
// #endif
},
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 41562cc..cad92c0 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -287,8 +287,8 @@
v-html="description.content.replace(/
/ig, '')">
-
- {{description.content.title}}
+
+ {{description.content.title}}
@@ -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;
+ }
+ }
\ No newline at end of file
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 122ff8e..a11af51 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -40,7 +40,7 @@
{{loadTitle}}
-
+
@@ -98,7 +98,7 @@
that.$set(that, 'productList', productList);
}, 500)
-
+
that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => {
@@ -118,52 +118,45 @@
},
//缴纳保证金
paydecimal() {
- if (this.merchant_Data.is_margin != 1) {
- this.$util.Tips({
- title: '暂时无需缴纳保证金'
- });
- } else {
- let that = this
- uni.showModal({
- title: '提示',
- content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
- success: (res) => {
- if (res.confirm) {
-
- // console.log('用户点击确定');
- paymerchant().then((res) => {
-
- uni.requestPayment({
- provider: 'wxpay',
- orderInfo: res.data
- .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
- success: (res) => {
- that.$util.Tips({
- title: '支付成功'
- });
- that.decimal()
- that.list(true)
- },
- fail: (err) => {
- that.$util.Tips({
- title: '支付失败'
- });
-
- console.log('fail:' + JSON.stringify(err));
- }
- });
- }).catch((err) => {
- console.log(err)
+ let that = this
+ uni.showModal({
+ title: '提示',
+ content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
+ success: (res) => {
+ if (res.confirm) {
+ paymerchant().then((res) => {
+ uni.requestPayment({
+ provider: 'wxpay',
+ orderInfo: res.data
+ .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+ success: (res) => {
+ that.$util.Tips({
+ title: '支付成功'
+ });
+ that.decimal()
+ that.list(true)
+ },
+ fail: (err) => {
+ that.$util.Tips({
+ title: '支付失败'
+ });
+ console.log('fail:' + JSON.stringify(err));
+ }
+ });
+ }).catch((err) => {
+ console.log(err)
+ that.$util.Tips({
+ title: err
})
- } else if (res.cancel) {
- console.log('用户点击取消');
- }
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消');
}
- });
+ }
+ });
- }
+ }
- },
}
}
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index e681ae3..6243428 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -54,12 +54,14 @@
订单管理
-->
+
入库管理
+
@@ -82,12 +84,12 @@
订单核销
-
+
缴纳保证金
-
-
-
+
+
+
+ {{ town }}里海云仓
+
+
+
+
+
+
+
+
+
+
-
- {{town}}里海云仓
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
- 供销综合云市场
-
-
+
+
+
+
+ {{ town }}里海云仓
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+ 搜索
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ {{ item.tit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.store_name || item.store_info }}
+
+
+
+ {{
+ item.rate
+ }}
+ {{ item.reply_count }}评论
+
+
+
+
+ ￥{{
+ item.price
+ }}
+
+ ￥30.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无商品
+
+
+
+
+
+
+
+
+
-
+
+ ￥{{ totalMoney }}
+ 支持配送 售后无忧
+
+
+ 去结算
+
+
+
+
+
+
+
+
+
+
+
+ 里海云仓
+
+
+
+
+
+
+ {{ item.category_name }}云仓服务
+
+
+ {{ item.description }}
+
+
+
+
-
-
-
-
-
-
-
- {{item.tit}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.store_info}}
-
-
-
- {{item.rate}}
- {{item.reply_count}}评论
-
-
-
-
- ￥{{item.price}}
-
-
- ￥30.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无商品
-
-
-
-
-
-
-
-
-
-
-
- {{goodsNum}}
-
-
-
-
- ￥{{totalMoney}}
-
-
- 支持配送 售后无忧
-
-
-
-
- 去结算
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 里海云仓
-
-
-
-
-
-
-
- {{item.category_name}}云仓服务
-
-
- {{item.description}}
-
-
-
-
-
-
-
-
-
+
+
+
+ 当前区域暂无云仓
+
+
+
+
+
+
+
-
-
- 当前区域暂无云仓
-
-
-
+
+
-
-
+
+
+
+
+ 当前区域暂无云仓
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 当前区域暂无云仓
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{skuform.store_info}}
-
-
-
- ￥ {{skuform.price}}
-
-
- 库存:{{skuform.sku[this.skusize].stock}}
-
-
-
-
-
-
- 尺码
-
-
- {{item.sku}}
-
-
-
-
-
- 数量
-
-
-
-
-
-
- 确定
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ skuform.store_info }}
+
+
+ ￥ {{ skuform.price }}
+
+ 库存:{{ skuform.sku[this.skusize].stock }}
+
+
+
+
+
+ 尺码
+
+ {{ item.sku }}
+
+
+
+ 数量
+
+
+
+
+ 确定
+
+
+
+
\ No newline at end of file
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index d046642..c255095 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -151,23 +151,23 @@
:disable-touch="true">
+ height="718.46rpx">
-
+
@@ -532,9 +533,9 @@
that.followDetail = null
that.loadData = false
uni.hideLoading()
- return that.$util.Tips({
- title: err
- });
+ // return that.$util.Tips({
+ // title: err
+ // });
})
},
/*获取评论*/
diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue
index bad9ae3..8c1208b 100644
--- a/pages/plant_release/index.vue
+++ b/pages/plant_release/index.vue
@@ -130,7 +130,7 @@
selHeight="250upx">
-
+
diff --git a/pages/product/addGoods/commodity.vue b/pages/product/addGoods/commodity.vue
index ad41d6a..39eaa20 100644
--- a/pages/product/addGoods/commodity.vue
+++ b/pages/product/addGoods/commodity.vue
@@ -2,7 +2,7 @@
-
+
商品详情
-
+
商品排序
@@ -140,6 +140,10 @@
type: [String, Number],
default: ''
},
+ showCommodity: {
+ type: Boolean,
+ default: false
+ },
resetKey: {
type: Boolean,
default: false
@@ -162,22 +166,26 @@
once_count: '', // 限购数量
video_link: ''
},
- goodsDis: {imageList: []},
+ goodsDis: {imageList: [],store_name:""},
store_name:'',
moreThanFlag: true,
};
},
- created() {
- // console.log('123');
+ mounted() {
this.initData();
+ // this.$nextTick(()=>{
+ // this.initData();
+ // })
+ },
+ updated() {
+ // this.initData();
},
-
watch: {
addGoodsSecoundData: {
handler(val) {
setTimeout(() => {
- setStorage(this.product_id ? 'editGoodsDetils' : 'addGoodsSecoundData', val)
+ setStorage('editCommodity', val)
});
},
deep: true
@@ -214,12 +222,21 @@
this.disModel = true;
}
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 => {
+ console.log(item, editGoodsDetils[item]);
this.addGoodsSecoundData[item] = editGoodsDetils[item];
});
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', {
store_name: editGoodsDetils.content.title,
imageList: editGoodsDetils.content.image
@@ -228,6 +245,11 @@
}
setStorage('canChangeSecound', true);
return;
+ }else {
+ setStorage('goodsDis', {
+ store_name: '',
+ imageList: []
+ });
}
if (getStorage('addGoodsSecoundData')) {
@@ -236,10 +258,6 @@
this.addGoodsSecoundData[item] = getStorage('addGoodsSecoundData')[item];
}
});
-
-
-
-
}
},
lastStep() {
@@ -514,7 +532,7 @@
border-radius: 50%;
padding: 8rpx;
background: #e93323;
- z-index: 999;
+ z-index: 2;
}
video {
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index a93082e..3d8aa8f 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -1,61 +1,59 @@
-
-
-
-
- 商品编码
-
-
-
-
-
-
- {{ setFormData.store_name.length }}
- 0
- /60
-
-
-
- 建议：图片尺寸为750*750px
-
-
-
-
-
-
-
-
-
-
-
- 添加图片
-
-
-
-
-
-
-
-
+
+
+
+
+ 商品编码
+
+
+
+
+
+
+ {{ setFormData.store_name.length }}
+ 0
+ /60
+
+
+
+ 建议：图片尺寸为750*750px
+
+
+
+
+
+
+
+
+
+
+
+ 添加图片
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/product/addGoods/price.vue b/pages/product/addGoods/price.vue
index 39938ed..0dba6c6 100644
--- a/pages/product/addGoods/price.vue
+++ b/pages/product/addGoods/price.vue
@@ -1,202 +1,230 @@
-
-
-
- 更多
+
+
+
+ 更多
收起
-
-
-
+
+ .container {
+ padding: 0 !important;
+ }
+
+ .more_than {
+ background: #FFFFFF;
+ border-radius: 0 0 10rpx 10rpx;
+ margin: auto;
+ // margin-top: 30rpx;
+ margin-top: 1px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 710rpx;
+ height: 84rpx;
+ color: #333333;
+ font-size: 30rpx;
+ }
+
+ .handle {
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ height: 126rpx;
+ background: #FFFFFF;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .button {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #FFFFFF;
+ font-size: 32rpx;
+ width: 690rpx;
+ height: 86rpx;
+ background: #E93323;
+ border-radius: 43rpx;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue
index 69e3365..bc78a48 100644
--- a/pages/product/addGoods/secound.vue
+++ b/pages/product/addGoods/secound.vue
@@ -50,41 +50,42 @@
商品视频
-
+
-
-
-
-
-
- 
-
+
+
+
+
+
+
+
-
-
-
-
-
- 点击可预览视频
-
-
-
-
-
-
-
- 点击可预览视频
-
-
+
+
+
+
+
+ 点击可预览视频
+
+
+
+
+
+
+
+ 点击可预览视频
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -93,18 +94,18 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
上一步
提交
@@ -154,7 +155,7 @@
data() {
return {
showComponent: false,
- showVideo:false,
+ showVideo: false,
disModel: false,
upload_max: 10,
uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
@@ -172,7 +173,7 @@
// console.log('123');
this.initData();
},
-
+
watch: {
addGoodsSecoundData: {
handler(val) {
@@ -190,16 +191,16 @@
}
},
methods: {
- videoshow() {
- this.showVideo = true
- this.videoContext = uni.createVideoContext('myVideo', this);
- this.$nextTick(() => {
- this.videoContext.play();
- })
- // this.video_link = this.formData.video_link;
- // this.videoContext.requestFullScreen({ direction: 90 });
- // this.videoContext.play(); this.videoplay = true;
- },
+ videoshow() {
+ this.showVideo = true
+ this.videoContext = uni.createVideoContext('myVideo', this);
+ this.$nextTick(() => {
+ this.videoContext.play();
+ })
+ // this.video_link = this.formData.video_link;
+ // this.videoContext.requestFullScreen({ direction: 90 });
+ // this.videoContext.play(); this.videoplay = true;
+ },
initData() {
let editGoodsDetils = {};
if (getStorage('goodsDis')) {
@@ -241,7 +242,7 @@
submitCreatedGoods() {
Loading();
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')] :
getStorage('attrValue');
@@ -254,12 +255,25 @@
},
video_link: this.addGoodsSecoundData.video_link
};
-
- if(attrValue){
- postData.attrValue = attrValue.filter(item => item != '');
- postData.attrValue[0].bar_code
- }
- // console.log(postData);
+ if (attrValue) {
+ postData.attrValue = attrValue.filter(item => item != '');
+ 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);
+ 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) {
// postData.attr = [getStorage('singleSpecification')];
}
@@ -275,7 +289,7 @@
Modal('提交成功', '点击确定，返回商品管理', {
showCancel: false
}).then(() => {
- uni.removeStorageSync('singleSpecification')
+ uni.removeStorageSync('singleSpecification')
uni.redirectTo({
url: '/pages/product/goodsOnSale/index?mer_id=' + this.merId
})
@@ -328,8 +342,8 @@
uni.chooseVideo({
sourceType: ['camera', 'album'],
success: res => {
- console.log(res)
-
+ console.log(res)
+
if (Math.ceil(res.size / 1024) < this.upload_max * 1024) {
uni.uploadFile({
url: this.uploadUrl, //仅为示例，非真实的接口地址
@@ -361,11 +375,11 @@
}
},
fail: err => {
- // 取消上传也会出现弹框
+ // 取消上传也会出现弹框
// uni.showModal({
// content: JSON.stringify(err)
// });
- console.log(err)
+ console.log(err)
}
});
},
@@ -419,32 +433,34 @@
}
}
}
- .videoHover {
- width: 180rpx;
- height: 180rpx;
+
+ .videoHover {
+ width: 180rpx;
+ height: 180rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 10;
+
+ view {
+ width: 50rpx;
+ height: 50rpx;
+ background: #000000;
+ border-radius: 50rpx;
display: flex;
align-items: center;
justify-content: center;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 10;
- view {
- width: 50rpx;
- height: 50rpx;
- background: #000000;
- border-radius: 50rpx;
- display: flex;
- align-items: center;
- justify-content: center;
-
- .iconfont {
- color: #ffffff;
- font-size: 21rpx;
- }
+ .iconfont {
+ color: #ffffff;
+ font-size: 21rpx;
}
}
+ }
+
.photo {
border: 1px solid #dddddd;
opacity: 1;
@@ -487,10 +503,12 @@
height: 150rpx;
}
}
-.preview_video{
- position: absolute;
-
-}
+
+ .preview_video {
+ position: absolute;
+
+ }
+
.container_input {
background: #fff;
padding: 0 20rpx;
@@ -609,6 +627,7 @@
.marginTop_none {
margin-top: 0;
}
+
.video-count {
position: fixed;
width: 600rpx;
@@ -627,6 +646,7 @@
height: 500rpx;
}
}
+
// .writeBg {
// background: #fff;
// }
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index df3097b..3edbf20 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -7,8 +7,8 @@
上传店铺背景图
-
+
@@ -74,9 +74,11 @@
配送方式：
-
- 到店自提(加入供应链)
- 快递配送
+
+ 到店自提(加入供应链)
+ 快递配送
@@ -110,10 +112,12 @@
店铺营业时间:
- {{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
+ {{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
+
至
- {{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
+ {{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
+
@@ -134,8 +138,8 @@
客服电话：
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -361,6 +362,7 @@
import {
navigateBack
} from '../../../libs/uniApi';
+import list from '../../../uni_modules/uview-ui/libs/config/props/list';
export default {
computed: configMap({
statusBarHeight: 0,
@@ -718,6 +720,7 @@
// });
// })'
// that.isUser ?
+
videoList({
page: that.page,
limit: that.limit,
@@ -896,11 +899,43 @@
// if(!this.loadVideo) return
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.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++) {
msg[i]['isMore'] = false
msg[i]['playIng'] = false
@@ -914,6 +949,7 @@
if (this.dataList.length !== 0) {
this.dataList[this.k].state = 'play';
uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+ this.page = that.page + 1
}
}).catch(err => {
return uni.showToast({
@@ -924,7 +960,6 @@
})
-
// this.isUser ?
// myVideoList(this.userUid, {
// page: this.page,
@@ -1113,7 +1148,6 @@
}