代码更新
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/iconlihai.css';
|
||||
@import 'static/iconfont/icontan.css';
|
||||
@import 'static/iconfont/demo.css';
|
||||
@import 'static/css/style.scss';
|
||||
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ import request from "@/utils/request.js";
|
||||
*
|
||||
*/
|
||||
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) => {
|
||||
uni.showModal({
|
||||
...obj,
|
||||
title: title,
|
||||
content: content,
|
||||
success: (res) => {
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
"description" : "",
|
||||
"versionName" : "1.4.7",
|
||||
"versionCode" : 147,
|
||||
"versionName" : "1.4.7",
|
||||
"versionCode" : 147,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
@ -31,7 +33,8 @@
|
||||
"UniMP" : {
|
||||
"description" : "uni小程序"
|
||||
},
|
||||
"Maps" : {}
|
||||
"Maps" : {},
|
||||
"Push" : {}
|
||||
},
|
||||
"safearea" : {
|
||||
"bottom" : {
|
||||
@ -120,7 +123,8 @@
|
||||
}
|
||||
},
|
||||
"oauth" : {},
|
||||
"ad" : {}
|
||||
"ad" : {},
|
||||
"push" : {}
|
||||
},
|
||||
"icons" : {
|
||||
"android" : {
|
||||
@ -161,7 +165,7 @@
|
||||
"nativePlugins" : {
|
||||
"JG-JCore" : {
|
||||
"JPUSH_APPKEY_IOS" : "8a5efd65cda14fafa6e64ad3",
|
||||
"JPUSH_CHANNEL_IOS" : "",
|
||||
"JPUSH_CHANNEL_IOS" : "8a5efd65cda14fafa6e64ad3",
|
||||
"JPUSH_APPKEY_ANDROID" : "b5f679f4357018605ea6fd2e",
|
||||
"JPUSH_CHANNEL_ANDROID" : "",
|
||||
"__plugin_info__" : {
|
||||
|
||||
@ -91,6 +91,7 @@
|
||||
import authorize from '@/components/Authorize';
|
||||
import emptyPage from '@/components/emptyPage.vue'
|
||||
import { configMap } from '@/utils';
|
||||
import { navigateBack } from '../../../libs/uniApi';
|
||||
const app = getApp();
|
||||
export default {
|
||||
components: {
|
||||
@ -198,6 +199,14 @@
|
||||
that.$util.Tips({
|
||||
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();
|
||||
})
|
||||
.catch(res => {
|
||||
|
||||
@ -293,6 +293,9 @@
|
||||
this.merId = option.merId;
|
||||
this.getIndex();
|
||||
},
|
||||
onShow(){
|
||||
this.getIndex();
|
||||
},
|
||||
methods: {
|
||||
// 关闭二维码弹窗
|
||||
popUpClose() {
|
||||
|
||||
@ -134,11 +134,15 @@
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
let params = {
|
||||
status: that.status,
|
||||
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) {
|
||||
return that.$util.Tips({
|
||||
title: '请填写收货人姓名'
|
||||
|
||||
@ -122,6 +122,7 @@
|
||||
},
|
||||
// 扫码核销
|
||||
scanCode() {
|
||||
|
||||
var self = this;
|
||||
// #ifdef MP || APP-PLUS
|
||||
wx.scanCode({
|
||||
@ -129,15 +130,14 @@
|
||||
success(res) {
|
||||
self.verify_code = res.result
|
||||
// console.log(self.verify_code);
|
||||
console.log('111',self.mer_id,self.verify_code)
|
||||
verifierOrder(self.mer_id,self.verify_code)
|
||||
.then(res => {
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
|
||||
// });
|
||||
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
|
||||
});
|
||||
|
||||
})
|
||||
.catch(res => {
|
||||
self.verify_code = ''
|
||||
@ -165,12 +165,11 @@
|
||||
scanType: ["qrCode", "barCode"]
|
||||
}).then(res=>{
|
||||
this.verify_code = res.resultStr
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/admin/cancellate_result/index?code='+self.verify_code+'&mer_id='+self.mer_id
|
||||
// });
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/admin/orderList/index?types=2'+'&mer_id='+self.mer_id
|
||||
});
|
||||
|
||||
// this.codeChange();
|
||||
}).catch(res => {
|
||||
this.$util.Tips({
|
||||
|
||||
@ -53,7 +53,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<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">
|
||||
￥{{ item.refundOrder.refund_price }}
|
||||
</div>
|
||||
@ -89,7 +90,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}</div>
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -114,7 +116,8 @@
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}</div>
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -135,7 +138,8 @@
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}</div>
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -143,7 +147,7 @@
|
||||
<!--拼团商品链接-->
|
||||
<div class="conter acea-row row-middle"
|
||||
v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
|
||||
<div class=" noPad">
|
||||
<div class="noPad">
|
||||
<navigator class="acea-row row-column-around noPad"
|
||||
v-if="item.productGroup.product_group_id"
|
||||
:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
|
||||
@ -156,7 +160,8 @@
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}</div>
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -207,7 +212,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<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">
|
||||
￥{{ item.refundOrder.refund_price }}
|
||||
</div>
|
||||
@ -216,6 +222,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
|
||||
<!--订单链接-->
|
||||
<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
|
||||
<div class="broadcast-details_num acea-row row-middle">
|
||||
@ -243,7 +250,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}</div>
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -267,7 +275,8 @@
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}</div>
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -288,7 +297,8 @@
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}</div>
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -309,7 +319,8 @@
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}</div>
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -358,6 +369,7 @@
|
||||
<block v-for="(items,index) in history" v-if="userId == 0" :key="items.time">
|
||||
<div class="create_time">{{items.time}}</div>
|
||||
<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 v-if="item.msn_type !== 100" class="pictrue">
|
||||
@ -388,7 +400,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<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">
|
||||
￥{{ val.product.cart_info.productAttr.price }}
|
||||
</div>
|
||||
@ -425,7 +438,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}</div>
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -450,7 +464,8 @@
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}</div>
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -471,7 +486,8 @@
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}</div>
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -492,7 +508,8 @@
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}</div>
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -534,7 +551,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<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">
|
||||
共{{item.refundOrder.refund_num}}件商品，
|
||||
合计 ￥{{ item.refundOrder.refund_price }}
|
||||
@ -571,7 +589,8 @@
|
||||
</div>
|
||||
<div class="broadcast_details_picBox noPad">
|
||||
<div class="broadcast_details_tit">
|
||||
{{val.cart_info.product.store_name}}</div>
|
||||
{{val.cart_info.product.store_name}}
|
||||
</div>
|
||||
<div class="broadcast_details_pic">
|
||||
￥{{ item.orderInfo.pay_price }}
|
||||
</div>
|
||||
@ -596,7 +615,8 @@
|
||||
￥{{ item.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.product.store_name}}</div>
|
||||
{{item.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -617,7 +637,8 @@
|
||||
￥{{ item.presell.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.presell.store_name}}</div>
|
||||
{{item.presell.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -638,7 +659,8 @@
|
||||
￥{{ item.productGroup.product.price }}
|
||||
</div>
|
||||
<div class="broadcast_details_tit_no line1">
|
||||
{{item.productGroup.product.store_name}}</div>
|
||||
{{item.productGroup.product.store_name}}
|
||||
</div>
|
||||
</div>
|
||||
</navigator>
|
||||
</div>
|
||||
@ -778,7 +800,7 @@
|
||||
</view>
|
||||
</div>
|
||||
</form>
|
||||
<div class="banner slider-banner">
|
||||
<div class="banner slider-banner" >
|
||||
<swiper class="swiper-wrapper" :autoplay="autoplay" :circular="circular" :interval="interval"
|
||||
:duration="duration" v-if="emojiGroup.length > 0">
|
||||
<block v-for="(emojiList, index) in emojiGroup" :key="index">
|
||||
@ -786,10 +808,12 @@
|
||||
<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'"
|
||||
v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i>
|
||||
</swiper-item>
|
||||
|
||||
</block>
|
||||
</swiper>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="recording" v-if="recording">
|
||||
<image src="/static/images/recording.png" />
|
||||
@ -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 {
|
||||
|
||||
@ -5,9 +5,10 @@
|
||||
<view class="back" @click='set_where(1)'>
|
||||
<view class="iconfont icon-xiangzuo"></view>
|
||||
</view>
|
||||
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
|
||||
<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
|
||||
:value='where.keyword' @confirm="searchSubmit" @input="inputChange"></input>
|
||||
<view class='input acea-row row-between-wrapper'>
|
||||
<text class='iconfont icon-sousuo'></text>
|
||||
<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
|
||||
:value='where.keyword' @confirm="searchSubmit" @input="inputChange">
|
||||
</view>
|
||||
<view style="text-align: right;" v-if="tabIndex==1" class='iconfont'
|
||||
:class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view>
|
||||
|
||||
@ -109,8 +109,8 @@
|
||||
|
||||
</view>
|
||||
<view class="content_bootm">
|
||||
<view class="content_bootm_txt">
|
||||
查看TA提到的宝贝(2)
|
||||
<view class="content_bootm_txt" v-if="objinfo.product_list.length>0">
|
||||
查看TA提到的宝贝({{objinfo.product_list.length}})
|
||||
</view>
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@
|
||||
</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>
|
||||
</template>
|
||||
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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
|
||||
|
||||
},
|
||||
|
||||
@ -287,8 +287,8 @@
|
||||
v-html="description.content.replace(/<br\/>/ig, '')"></view>
|
||||
<!-- #endif -->
|
||||
<view v-else class="product_content">
|
||||
<view v-if="description.content && description.content.title" class="title">
|
||||
{{description.content.title}}
|
||||
<view v-if="description.content && description.content.title" class="product_content_title">
|
||||
{{description.content.title}}
|
||||
</view>
|
||||
<view v-if="description.content && description.content.image" class="pictures" style="background-color: #fff;">
|
||||
<image v-for="(item,index) in description.content.image" :key="index" :src="item" mode="aspectFit">
|
||||
@ -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>
|
||||
@ -40,7 +40,7 @@
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
|
||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -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('用户点击取消');
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -54,12 +54,14 @@
|
||||
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
|
||||
<text class="text">订单管理</text>
|
||||
</view> -->
|
||||
|
||||
<view class="examine"
|
||||
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
|
||||
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">入库管理</text>
|
||||
</view>
|
||||
|
||||
<view class="examine"
|
||||
@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
|
||||
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
|
||||
@ -82,12 +84,12 @@
|
||||
</image>
|
||||
<text class="text">订单核销</text>
|
||||
</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>
|
||||
<text class="text">缴纳保证金</text>
|
||||
</view>
|
||||
<!-- <view class="examine"
|
||||
<!-- <view class="examine"
|
||||
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
|
||||
</image>
|
||||
@ -140,7 +142,7 @@
|
||||
<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
|
||||
</view>
|
||||
<view class="content ">
|
||||
<!-- <view class="examine"
|
||||
<!-- <view class="examine"
|
||||
@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
|
||||
|
||||
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
|
||||
@ -203,8 +205,12 @@
|
||||
</image>
|
||||
<text class="text">缴纳保证金</text>
|
||||
</view>
|
||||
|
||||
<!-- <view class="examine"
|
||||
<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"
|
||||
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
|
||||
</image>
|
||||
@ -318,7 +324,7 @@
|
||||
<text class="text">商户设置</text>
|
||||
</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>
|
||||
<text class="text">缴纳保证金</text>
|
||||
@ -389,7 +395,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</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>
|
||||
<text class="text">缴纳保证金</text>
|
||||
@ -631,7 +637,7 @@
|
||||
created() {},
|
||||
onLoad() {
|
||||
this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
|
||||
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
|
||||
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
|
||||
},
|
||||
onShow() {
|
||||
if (this.isLogin) {
|
||||
@ -868,7 +874,7 @@ this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
|
||||
}
|
||||
|
||||
},
|
||||
//
|
||||
|
||||
logout() {
|
||||
uni.switchTab({
|
||||
url: '/pages/gather/gather'
|
||||
@ -881,10 +887,7 @@ this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
|
||||
})
|
||||
},
|
||||
navigator(url, t) {
|
||||
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
||||
|
||||
|
||||
if (this.codenote.length == 0) {
|
||||
this.isFshow = true
|
||||
this.countDown()
|
||||
@ -899,7 +902,6 @@ this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+45;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
uni.navigateTo({
|
||||
url: url
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -151,23 +151,23 @@
|
||||
:disable-touch="true">
|
||||
<swiper-item v-for="(item,index) in cloudList">
|
||||
<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>
|
||||
</view>
|
||||
<view class="" style="height:998.83rpx;" v-if="act_swiper">
|
||||
<view class="" style="height:718.46rpx;" v-if="act_swiper">
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<view class="menu" v-if="showtit" style="transition: 1s;">
|
||||
<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">
|
||||
<swiper-item v-for="(item,index) in cloudList" :key="index" @click="clickSwiperFn(index)">
|
||||
<view class="swiper_item" :class="{swiper_item_act:index==current}">
|
||||
<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>
|
||||
|
||||
</swiper-item>
|
||||
@ -199,7 +199,7 @@
|
||||
<view class="right">
|
||||
<view class="tit">
|
||||
<!-- 亿福馒头粉纯天然无添加小麦粉加工 1000g/袋 -->
|
||||
{{item.store_info}}
|
||||
{{ item.store_name || item.store_info }}
|
||||
</view>
|
||||
<view class="">
|
||||
<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>
|
||||
</view>
|
||||
@ -405,7 +404,8 @@
|
||||
</u-popup>
|
||||
</view>
|
||||
|
||||
|
||||
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
|
||||
</authorize>
|
||||
</view>
|
||||
|
||||
</template>
|
||||
@ -493,7 +493,7 @@
|
||||
page_num: 1,
|
||||
act_img: "",
|
||||
cartTagInfo: {},
|
||||
isAuto: false,
|
||||
|
||||
headTop1: "",
|
||||
actList: [{
|
||||
tit: '综合',
|
||||
@ -511,6 +511,7 @@
|
||||
}],
|
||||
status: "loadmore",
|
||||
flag: false,
|
||||
isAuto: false,
|
||||
isShowAuth: false, //是否隐藏授权
|
||||
|
||||
}
|
||||
@ -860,8 +861,9 @@
|
||||
},
|
||||
addcart(item, i) {
|
||||
if (!this.isLogin) {
|
||||
this.isAuto = true;
|
||||
this.isShowAuth = true
|
||||
console.log('2222')
|
||||
this.isAuto = true
|
||||
this.isShowAuth = true;
|
||||
return
|
||||
}
|
||||
|
||||
@ -1299,11 +1301,11 @@
|
||||
|
||||
.menu {
|
||||
position: absolute;
|
||||
top: 748rpx;
|
||||
top: 490rpx;
|
||||
width: 750rpx;
|
||||
// background-color: rgba(255, 255, 255, 0.7);
|
||||
height: 250rpx;
|
||||
// height: 175.23rpx;
|
||||
// height: 140.19rpx;
|
||||
// box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
|
||||
// box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
|
||||
|
||||
@ -1398,9 +1400,9 @@
|
||||
|
||||
.act_img {
|
||||
// transition:t;
|
||||
transform: translateY(-840rpx);
|
||||
transform: translateY(-580rpx);
|
||||
/* #ifdef APP-PLUS */
|
||||
transform: translateY(-800rpx);
|
||||
transform: translateY(-540rpx);
|
||||
/* #endif */
|
||||
|
||||
}
|
||||
@ -1427,7 +1429,7 @@
|
||||
|
||||
.swipers {
|
||||
width: 750rpx;
|
||||
height: 998.83rpx;
|
||||
height: 718.46rpx;
|
||||
}
|
||||
|
||||
.card {
|
||||
@ -1464,7 +1466,7 @@
|
||||
font-size: 33.29rpx;
|
||||
line-height: 50px;
|
||||
background: linear-gradient(to right, #F84221, #FF6D20);
|
||||
width: 175.23rpx;
|
||||
width: 140.19rpx;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
@ -264,7 +264,8 @@
|
||||
<image src="../static/images/no_content.png"></image>
|
||||
<text>内容不存在，可能被删除了哦~</text>
|
||||
<navigator class="btn" :open-type="open_grass ? 'switchTab' : 'navigate'"
|
||||
url="/pages/plant_grass/index">返回首页</navigator>
|
||||
url="/pages/index/index">返回首页</navigator>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<!-- 他提到的宝贝弹窗 -->
|
||||
@ -532,9 +533,9 @@
|
||||
that.followDetail = null
|
||||
that.loadData = false
|
||||
uni.hideLoading()
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
// return that.$util.Tips({
|
||||
// title: err
|
||||
// });
|
||||
})
|
||||
},
|
||||
/*获取评论*/
|
||||
|
||||
@ -130,7 +130,7 @@
|
||||
selHeight="250upx">
|
||||
</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>
|
||||
</uni-popup>
|
||||
<!-- 话题弹窗 -->
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<view class=" writeBg ">
|
||||
|
||||
<view class="content_list">
|
||||
<view class="content_list_item" @click="inputGoodsDetils">
|
||||
<view class="content_list_item">
|
||||
<view>商品详情</view>
|
||||
<!-- <view class="content_list_item_han">
|
||||
<span v-if="disModel" style="color: #000000">去修改</span>
|
||||
@ -73,13 +73,13 @@
|
||||
<span>开启后此商品只能在分销礼包中展示并销售</span>
|
||||
</view> -->
|
||||
<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_value">
|
||||
<input v-model="addGoodsSecoundData.once_count" type="number" value="" placeholder="请输入限购数量"
|
||||
placeholder-class="inputPlaceHolder" />
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="container_input_item">
|
||||
<view class="container_input_item_label"><span>商品排序</span></view>
|
||||
<view class="container_input_item_value">
|
||||
@ -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 {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,202 +1,230 @@
|
||||
<template>
|
||||
<view class="container">
|
||||
<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 v-if="moreThanFlag">更多</view>
|
||||
<view class="container">
|
||||
<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 v-if="moreThanFlag">更多</view>
|
||||
<view v-else>收起</view>
|
||||
</view>
|
||||
<!-- <view class="handle">
|
||||
</view>
|
||||
<!-- <view class="handle">
|
||||
<view class="button" @click="saveSingleSpecification">
|
||||
保存
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import selectForm from '../components/selectForm.vue';
|
||||
import { navigateTo, navigateBack, serialize, setStorage, getStorage } from '../../../libs/uniApi.js';
|
||||
// 单规格商品 attrValue
|
||||
export default {
|
||||
components:{
|
||||
selectForm
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
singleSpecification: {
|
||||
price: '', // 售价
|
||||
cost: '', // 成本价
|
||||
ot_price: '', // 原价
|
||||
bar_code: '', // 商品编号
|
||||
weight: '', // 重量
|
||||
volume: '', // 体积
|
||||
image: '',
|
||||
extension_one: '',
|
||||
extension_two: ''
|
||||
},
|
||||
moreThanFlag: true,
|
||||
formList: [
|
||||
{
|
||||
id: 1,
|
||||
label: '售价',
|
||||
type: 'digit',
|
||||
model: 'price',
|
||||
holder: '请填写售价'
|
||||
},
|
||||
{
|
||||
id: 0,
|
||||
label: '库存',
|
||||
type: 'digit',
|
||||
model: 'stock_num',
|
||||
holder: '请填写库存'
|
||||
},
|
||||
],
|
||||
moreThanList: [
|
||||
{
|
||||
id: 2,
|
||||
label: '成本价',
|
||||
type: 'digit',
|
||||
holder: '请填写成本价',
|
||||
model: 'cost'
|
||||
import selectForm from '../components/selectForm.vue';
|
||||
import { navigateTo, navigateBack, serialize, setStorage, getStorage } from '../../../libs/uniApi.js';
|
||||
// 单规格商品 attrValue
|
||||
export default {
|
||||
components: {
|
||||
selectForm
|
||||
},
|
||||
props: ['product_id'],
|
||||
data() {
|
||||
return {
|
||||
singleSpecification: {
|
||||
price: '', // 售价
|
||||
cost: '', // 成本价
|
||||
stock: '', // 库存
|
||||
ot_price: '', // 原价
|
||||
bar_code: '', // 商品编号
|
||||
weight: '', // 重量
|
||||
volume: '', // 体积
|
||||
image: '',
|
||||
extension_one: '',
|
||||
extension_two: ''
|
||||
},
|
||||
moreThanFlag: true,
|
||||
formList: [{
|
||||
id: 1,
|
||||
label: '售价',
|
||||
type: 'digit',
|
||||
model: 'price',
|
||||
holder: '请填写售价'
|
||||
}, {
|
||||
id: 10,
|
||||
label: '库存',
|
||||
type: 'digit',
|
||||
model: 'stock',
|
||||
holder: '请填写库存',
|
||||
disable: true
|
||||
}],
|
||||
moreThanList: [{
|
||||
id: 2,
|
||||
label: '成本价',
|
||||
type: 'digit',
|
||||
holder: '请填写成本价',
|
||||
model: 'cost'
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
label: '原价',
|
||||
type: 'digit',
|
||||
holder: '请填写原价',
|
||||
model: 'ot_price'
|
||||
id: 3,
|
||||
label: '原价',
|
||||
type: 'digit',
|
||||
holder: '请填写原价',
|
||||
model: 'ot_price'
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
label: '商品编号',
|
||||
type: 'input',
|
||||
holder: '请填写商品编号',
|
||||
model: 'bar_code'
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
label: '重量',
|
||||
type: 'digit',
|
||||
holder: '请输入重量',
|
||||
model: 'weight'
|
||||
},
|
||||
{
|
||||
id: 7,
|
||||
label: '体积',
|
||||
type: 'digit',
|
||||
holder: '请输入体积',
|
||||
model: 'volume'
|
||||
},
|
||||
// {
|
||||
// id: 8,
|
||||
// label: '佣金（一级）',
|
||||
// type: 'digit',
|
||||
// holder: '请输入一级佣金',
|
||||
// model: 'extension_one'
|
||||
// },
|
||||
// {
|
||||
// id: 9,
|
||||
// label: '佣金（二级）',
|
||||
// type: 'digit',
|
||||
// holder: '请输入二级佣金',
|
||||
// model: 'extension_two'
|
||||
// }
|
||||
],
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
watch: {
|
||||
singleSpecification: {
|
||||
handler(val) {
|
||||
this.singleSpecification = val;
|
||||
{
|
||||
id: 5,
|
||||
label: '商品编号',
|
||||
type: 'input',
|
||||
holder: '请填写商品编号',
|
||||
model: 'bar_code'
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
label: '重量',
|
||||
type: 'digit',
|
||||
holder: '请输入重量',
|
||||
model: 'weight'
|
||||
},
|
||||
{
|
||||
id: 7,
|
||||
label: '体积',
|
||||
type: 'digit',
|
||||
holder: '请输入体积',
|
||||
model: 'volume'
|
||||
},
|
||||
// {
|
||||
// id: 8,
|
||||
// label: '佣金（一级）',
|
||||
// type: 'digit',
|
||||
// holder: '请输入一级佣金',
|
||||
// model: 'extension_one'
|
||||
// },
|
||||
// {
|
||||
// id: 9,
|
||||
// label: '佣金（二级）',
|
||||
// type: 'digit',
|
||||
// holder: '请输入二级佣金',
|
||||
// model: 'extension_two'
|
||||
// }
|
||||
],
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
watch: {
|
||||
singleSpecification: {
|
||||
handler(val) {
|
||||
this.singleSpecification = val;
|
||||
this.saveSingleSpecification();
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
// onLoad(option) {
|
||||
// console.log(option);
|
||||
// this.singleSpecification.bar_code=option.code
|
||||
// },
|
||||
// onShow() {
|
||||
// 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]
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// },
|
||||
// beforeDestroy() {
|
||||
// console.log('123');
|
||||
// uni.removeStorage({
|
||||
// key: 'singleSpecification'
|
||||
// });
|
||||
// },
|
||||
methods: {
|
||||
selectMoreThan() {
|
||||
this.formList = this.formList.concat(this.moreThanList);
|
||||
this.moreThanFlag = false;
|
||||
},
|
||||
spliceMoreThan() {
|
||||
this.moreThanFlag = true;
|
||||
this.formList.splice(2, this.formList.length);
|
||||
},
|
||||
input(val) {
|
||||
this.singleSpecification = val
|
||||
},
|
||||
// 保存
|
||||
saveSingleSpecification() {
|
||||
setStorage('singleSpecification', this.singleSpecification);
|
||||
// navigateBack(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
// onLoad(option) {
|
||||
// console.log(option);
|
||||
// this.singleSpecification.bar_code=option.code
|
||||
// },
|
||||
// onShow() {
|
||||
// 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]
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// },
|
||||
// beforeDestroy() {
|
||||
// console.log('123');
|
||||
// uni.removeStorage({
|
||||
// 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: {
|
||||
selectMoreThan() {
|
||||
this.formList = this.formList.concat(this.moreThanList);
|
||||
this.moreThanFlag = false;
|
||||
},
|
||||
spliceMoreThan() {
|
||||
this.moreThanFlag = true;
|
||||
// this.formList.splice(!this.$props.product_id ? 2 : 1, this.formList.length);
|
||||
this.formList.splice(2, this.formList.length);
|
||||
},
|
||||
input(val) {
|
||||
this.singleSpecification = val
|
||||
},
|
||||
// 保存
|
||||
saveSingleSpecification() {
|
||||
setStorage('singleSpecification', this.singleSpecification);
|
||||
// navigateBack(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.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;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
.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;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -50,41 +50,42 @@
|
||||
<view class="content_list_video">
|
||||
<view class="content_list_video_title">商品视频</view>
|
||||
<view class="video_list">
|
||||
<view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
|
||||
<view class="video_list_item photo" v-if="addGoodsSecoundData.video_link">
|
||||
<view class="jiao" @click="deleteImage()">
|
||||
<!-- video标签在app端层级过高 -->
|
||||
<!--#ifndef APP-PLUS-->
|
||||
<video :src="addGoodsSecoundData.video_link"></video>
|
||||
<!--#endif-->
|
||||
<!--#ifdef APP-PLUS-->
|
||||
<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png" style=" width:150rpx" ></img>
|
||||
<!--#endif-->
|
||||
<!-- video标签在app端层级过高 -->
|
||||
<!--#ifndef APP-PLUS-->
|
||||
<video :src="addGoodsSecoundData.video_link"></video>
|
||||
<!--#endif-->
|
||||
<!--#ifdef APP-PLUS-->
|
||||
<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
|
||||
style=" width:150rpx"></img>
|
||||
<!--#endif-->
|
||||
<image src="../static/images/close.png" mode="widthFix"></image>
|
||||
</view>
|
||||
|
||||
<!--#ifndef APP-PLUS-->
|
||||
<view style="position: absolute;">
|
||||
<view class="videoHover" @click="videoshow">
|
||||
</view>
|
||||
<text class="video-text">点击可预览视频</text>
|
||||
</view>
|
||||
<!--#endif-->
|
||||
|
||||
<!--#ifdef APP-PLUS-->
|
||||
<view class='preview_video'>
|
||||
<view class="videoHover" @click="videoshow">
|
||||
</view>
|
||||
<text class="video-text">点击可预览视频</text>
|
||||
</view>
|
||||
<!--#endif-->
|
||||
|
||||
<!--#ifndef APP-PLUS-->
|
||||
<view style="position: absolute;">
|
||||
<view class="videoHover" @click="videoshow">
|
||||
</view>
|
||||
<text class="video-text">点击可预览视频</text>
|
||||
</view>
|
||||
<!--#endif-->
|
||||
|
||||
<!--#ifdef APP-PLUS-->
|
||||
<view class='preview_video'>
|
||||
<view class="videoHover" @click="videoshow">
|
||||
</view>
|
||||
<text class="video-text">点击可预览视频</text>
|
||||
</view>
|
||||
<!--#endif-->
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<view class="photo" @click="uploadVideo" v-else>
|
||||
<view>
|
||||
<image src="../static/images/creamer.png" mode="widthFix"></image>
|
||||
@ -93,18 +94,18 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="showVideo" class="video-count">
|
||||
<!--#ifndef APP-PLUS-->
|
||||
<video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
|
||||
<!--#endif-->
|
||||
<!--#ifdef APP-PLUS-->
|
||||
|
||||
<video id="myVideo" class="videoLink" autoplay loop
|
||||
:src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
|
||||
<!--#endif-->
|
||||
</view>
|
||||
<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
|
||||
</view>
|
||||
<view v-if="showVideo" class="video-count">
|
||||
<!--#ifndef APP-PLUS-->
|
||||
<video id="myVideo" class="videoLink" autoplay loop muted :src="addGoodsSecoundData.video_link"></video>
|
||||
<!--#endif-->
|
||||
<!--#ifdef APP-PLUS-->
|
||||
|
||||
<video id="myVideo" class="videoLink" autoplay loop
|
||||
:src='addGoodsSecoundData.video_link && (addGoodsSecoundData.video_link.substring(0,4) == "http" || addGoodsSecoundData.video_link.substring(0,5) == "https") ?addGoodsSecoundData.video_link : "http:" + addGoodsSecoundData.video_link'></video>
|
||||
<!--#endif-->
|
||||
</view>
|
||||
<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
|
||||
<view class="handle dobuButton">
|
||||
<view class="handle_button margin_right" @click="lastStep">上一步</view>
|
||||
<view class="handle_button" @click="submitCreatedGoods">提交</view>
|
||||
@ -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;
|
||||
// }
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
<view class="store_bg">
|
||||
<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
|
||||
<block v-if="images[0].img">
|
||||
<!-- <u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
|
||||
@click="delImg(0)" mode="aspectFit"></u--image> -->
|
||||
<!-- <u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
|
||||
@click="delImg(0)" mode="aspectFit"></u--image> -->
|
||||
<u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
|
||||
@click="delImg(2)"></u--image>
|
||||
</block>
|
||||
@ -74,9 +74,11 @@
|
||||
<view class="flex_a_c">
|
||||
<text class="sub_title">配送方式：</text>
|
||||
<view class="flex">
|
||||
<checkbox-group name="" @change="checkboxChange" >
|
||||
<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提(加入供应链)</text>
|
||||
<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text class="text">快递配送</text>
|
||||
<checkbox-group name="" @change="checkboxChange">
|
||||
<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text
|
||||
class="text ziti">到店自提(加入供应链)</text>
|
||||
<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text
|
||||
class="text">快递配送</text>
|
||||
</checkbox-group>
|
||||
</view>
|
||||
</view>
|
||||
@ -110,10 +112,12 @@
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
|
||||
<view class="bus_time flex_a_c">
|
||||
<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">
|
||||
{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view>
|
||||
{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
@ -134,8 +138,8 @@
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
|
||||
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
|
||||
</view>
|
||||
|
||||
<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
|
||||
|
||||
<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
|
||||
<u-switch v-model="credit_buy" @change="change"></u-switch>
|
||||
</view>
|
||||
@ -221,7 +225,7 @@
|
||||
},
|
||||
isZiti: false,
|
||||
isKuaidi: false,
|
||||
delivery_way: [1,2],
|
||||
delivery_way: [1, 2],
|
||||
takeName: '',
|
||||
takePhone: '',
|
||||
servicePhone: '',
|
||||
@ -271,16 +275,16 @@
|
||||
credit_buy: false, //开启信用购
|
||||
interest_rate: '', //利率
|
||||
settle_cycle: '', //周期
|
||||
mer_name:'',
|
||||
type_code:''
|
||||
mer_name: '',
|
||||
type_code: ''
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
this.id = e.mer_id
|
||||
this.getMerchantInfo(e.mer_id)
|
||||
|
||||
this.isZiti = true
|
||||
this.isKuaidi = true
|
||||
|
||||
this.isZiti = true
|
||||
this.isKuaidi = true
|
||||
},
|
||||
onShow() {},
|
||||
methods: {
|
||||
@ -288,7 +292,7 @@
|
||||
merchantInfoAPI({
|
||||
id
|
||||
}).then(res => {
|
||||
this.mer_name= res.data.mer_name
|
||||
this.mer_name = res.data.mer_name
|
||||
this.images[0].img = res.data.mer_banner
|
||||
this.images[1].img = res.data.mer_avatar
|
||||
this.images[2].img = res.data.mini_banner
|
||||
@ -305,11 +309,11 @@
|
||||
res.data.mer_take_day.forEach((item, i) => {
|
||||
this.dateWeek[Number(item) - 1].isCheck = true
|
||||
})
|
||||
this.type_code= res.data.type_code
|
||||
this.type_code = res.data.type_code
|
||||
this.mer_take_time = res.data.mer_take_time
|
||||
this.intro = res.data.mer_info
|
||||
this.cruxText = res.data.mer_keyword
|
||||
|
||||
|
||||
this.servicePhone = res.data.service_phone
|
||||
this.mer_address = res.data.mer_address
|
||||
this.merState = res.data.mer_state === 1 ? true : false
|
||||
@ -374,7 +378,7 @@
|
||||
mer_avatar: this.images[1].img,
|
||||
mini_banner: this.images[2].img,
|
||||
mer_certificate: this.images[3].img,
|
||||
delivery_way: [1,2],
|
||||
delivery_way: [1, 2],
|
||||
mer_take_name: this.takeName,
|
||||
mer_take_phone: this.takePhone,
|
||||
mer_take_address: this.detailSite,
|
||||
@ -408,9 +412,9 @@
|
||||
// url:'/pages/moreProject/moreProject'
|
||||
// })
|
||||
uni.redirectTo({
|
||||
url:'/pages/moreProject/moreProject'
|
||||
url: '/pages/moreProject/moreProject'
|
||||
})
|
||||
|
||||
|
||||
}, 1000)
|
||||
}).catch(err => {
|
||||
Toast(err)
|
||||
@ -443,7 +447,7 @@
|
||||
// sizeType: ['original', 'compressed'],
|
||||
// sourceType: ['album', 'camera'],
|
||||
// success: function(res) {
|
||||
|
||||
|
||||
// uni.showLoading({
|
||||
// title: '上传中...'
|
||||
// })
|
||||
@ -461,7 +465,7 @@
|
||||
// Toast('添加失败')
|
||||
// }
|
||||
// });
|
||||
|
||||
|
||||
},
|
||||
delImg(i) {
|
||||
let that = this
|
||||
|
||||
@ -31,7 +31,8 @@
|
||||
<text v-else>0</text>/200
|
||||
</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>
|
||||
</view>
|
||||
|
||||
@ -110,7 +111,7 @@
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
// console.log(this.$props.prodectContent);
|
||||
},
|
||||
methods: {
|
||||
handleChooseImage() {
|
||||
@ -142,10 +143,11 @@
|
||||
[TOKENNAME]: 'Bearer ' + store.state.app.token
|
||||
},
|
||||
success: (uploadFileRes) => {
|
||||
// console.log(uploadFileRes.data);
|
||||
// console.log(JSON.parse(uploadFileRes.data));
|
||||
let imgData = JSON.parse(uploadFileRes.data)
|
||||
// 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) {
|
||||
// console.log(res)
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
<swiper-item :class="{ active: 1 == swiperCur }">
|
||||
<view class="slide-navigator">
|
||||
<!-- 隐藏暂时不需要 -->
|
||||
<!-- <navigator class="item"
|
||||
<!-- <navigator class="item"
|
||||
:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
|
||||
hover-class='none'>
|
||||
<image mode='widthFix' class="image" src="../static/images/product_freight.png">
|
||||
@ -490,7 +490,6 @@
|
||||
that.loading = false;
|
||||
that.loaded = res.data.list.length < that.where.limit;
|
||||
that.productList.push.apply(that.productList, res.data.list);
|
||||
|
||||
that.where.page = that.where.page + 1;
|
||||
|
||||
},
|
||||
|
||||
@ -226,7 +226,8 @@
|
||||
<text class="count">{{item.relevance.length}}</text>
|
||||
</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>
|
||||
<navigator hover-class="none"
|
||||
:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
|
||||
@ -304,16 +305,16 @@
|
||||
deleteAndroidHeight
|
||||
这两个参数用于控制评论等的高度
|
||||
-->
|
||||
<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
|
||||
<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
|
||||
@closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
|
||||
</view>
|
||||
</uni-popup>
|
||||
<!-- 他提到的宝贝弹窗 -->
|
||||
<uni-popup type="bottom" ref="pinglunMentioned" style="background-color: rebeccapurple;">
|
||||
|
||||
|
||||
<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid" ></mentioned>
|
||||
|
||||
<uni-popup type="bottom" ref="pinglunMentioned">
|
||||
|
||||
|
||||
<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
|
||||
|
||||
</uni-popup>
|
||||
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
|
||||
<view class="fixed-head">
|
||||
@ -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 @@
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
|
||||
// .video-list{
|
||||
// padding: 200rpx 28.07rpx 0 28.07rpx;
|
||||
// display: flex;
|
||||
@ -1133,7 +1167,7 @@
|
||||
/* #ifdef MP */
|
||||
padding-top: 200rpx;
|
||||
/* #endif */
|
||||
|
||||
|
||||
// background-color: #000000;
|
||||
background-color: #F5F5F5;
|
||||
|
||||
@ -1256,18 +1290,19 @@
|
||||
left: 0;
|
||||
top: 70rpx;
|
||||
height: 86rpx;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.icon-xiangzuo {
|
||||
|
||||
|
||||
margin-left: 10px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
color: #ffffff;
|
||||
|
||||
|
||||
}
|
||||
|
||||
padding-right: 30rpx;
|
||||
}
|
||||
|
||||
|
||||
@ -190,6 +190,9 @@
|
||||
uni.hideKeyboard();
|
||||
}else{
|
||||
that.getUserInfo();
|
||||
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
/**
|
||||
@ -227,7 +230,8 @@
|
||||
let reply_id = that.reply_id ? that.reply_id : 0
|
||||
replyCreateApi(that.id,{content: that.content,reply_id: reply_id}).then(res => {
|
||||
// console.log(res.message)
|
||||
if(res.status == 1){
|
||||
// console.log(res)
|
||||
if(res.status == 200){
|
||||
if(that.isChild){
|
||||
if(that.list[that.index]['children']){
|
||||
that.list[that.index]['children'].push(res.data)
|
||||
@ -472,7 +476,7 @@
|
||||
.send{
|
||||
font-size: 26rpx;
|
||||
color: #ffffff;
|
||||
padding: 12rpx 30rpx;
|
||||
padding: 15rpx 30rpx;
|
||||
background: #E93323;
|
||||
border-radius: 30rpx;
|
||||
text-align: center;
|
||||
|
||||
@ -435,7 +435,9 @@
|
||||
},
|
||||
watch: {
|
||||
k(new_k, old_k) {
|
||||
|
||||
const max = new_k + 2;
|
||||
|
||||
if (this.max < max) {
|
||||
this.max = max;
|
||||
}
|
||||
@ -451,7 +453,7 @@
|
||||
uni.createVideoContext(this.dataList[old_k].community_id + '' + old_k, this)
|
||||
.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
|
||||
// console.log('已经暂停 --> 第' + (old_k + 1) + '个视频～') //提示
|
||||
// #ifdef MP
|
||||
|
||||
this.dataList[new_k].state = 'play'
|
||||
this.dataList[new_k].isplay = false
|
||||
this.dataList[new_k].playIng = true
|
||||
@ -461,7 +463,7 @@
|
||||
}, 250)
|
||||
}
|
||||
this.videoShare(this.dataList[new_k])
|
||||
// #endif
|
||||
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
@ -504,7 +506,7 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
//#ifdef MP
|
||||
|
||||
videoShare(item) {
|
||||
if (item && item.status == 1) {
|
||||
let uid = this.uid ? this.uid : 0;
|
||||
@ -520,7 +522,7 @@
|
||||
uni.hideShareMenu()
|
||||
}
|
||||
},
|
||||
// #endif
|
||||
|
||||
goBack: function() {
|
||||
uni.navigateBack();
|
||||
},
|
||||
@ -752,43 +754,43 @@
|
||||
let that = this
|
||||
|
||||
// 1.这里引入后端请求数据
|
||||
if (that.videoshow) {
|
||||
deoList(this.videoID).then(res => {
|
||||
that.videoData([res.data])
|
||||
if (res.data.list.length < that.limit) {
|
||||
this.loadMore = false;
|
||||
}
|
||||
}).catch(err => {
|
||||
return uni.showToast({
|
||||
title: err,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
})
|
||||
this.videoshow = false
|
||||
} else {
|
||||
// videoList().then(res=>{
|
||||
// that.videoData(res.data.list);
|
||||
// })
|
||||
// console.log(that.userUid,that.videoID)
|
||||
videoList({
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id: this.videoID
|
||||
|
||||
}).then(res => {
|
||||
that.videoData(res.data.list)
|
||||
if (res.data.list.length < that.limit) {
|
||||
this.loadMore = false;
|
||||
}
|
||||
}).catch(err => {
|
||||
return uni.showToast({
|
||||
title: err,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
})
|
||||
}
|
||||
// if (that.videoshow) {
|
||||
// deoList(this.videoID).then(res => {
|
||||
// that.videoData([res.data])
|
||||
// if (res.data.list.length < that.limit) {
|
||||
// this.loadMore = false;
|
||||
// }
|
||||
// }).catch(err => {
|
||||
// return uni.showToast({
|
||||
// title: err,
|
||||
// icon: 'none',
|
||||
// duration: 2000
|
||||
// });
|
||||
// })
|
||||
// this.videoshow = false
|
||||
// } else {
|
||||
// videoList().then(res=>{
|
||||
// that.videoData(res.data.list);
|
||||
// })
|
||||
// console.log(that.userUid,that.videoID)
|
||||
videoList({
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id: this.videoID
|
||||
|
||||
}).then(res => {
|
||||
that.videoData(res.data.list)
|
||||
if (res.data.list.length < that.limit) {
|
||||
this.loadMore = false;
|
||||
}
|
||||
}).catch(err => {
|
||||
return uni.showToast({
|
||||
title: err,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
})
|
||||
// }
|
||||
|
||||
// that.isUser ?
|
||||
// myVideoList(that.userUid, {
|
||||
@ -851,7 +853,9 @@
|
||||
this.communityId = list[0]['community_id']
|
||||
if (list.length == 0) return
|
||||
let that = this;
|
||||
|
||||
that.page = that.page + 1;
|
||||
|
||||
var msg = list
|
||||
// 2.这里把视频添加到视频列表
|
||||
for (let i = 0; i < msg.length; i++) {
|
||||
@ -861,15 +865,21 @@
|
||||
msg[i]['isplay'] = true
|
||||
msg[i]['loading'] = false
|
||||
that.dataList.push(msg[i])
|
||||
//#ifndef H5
|
||||
|
||||
|
||||
console.log(i, that.k)
|
||||
if (i == 0 && that.k == 0) {
|
||||
this.dataList[0].isplay = false
|
||||
this.dataList[0].playIng = true
|
||||
this.dataList[0].state = 'play'
|
||||
this.dataList[0].loading = false
|
||||
uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
|
||||
setTimeout(() => {
|
||||
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
|
||||
if (this.k == 0) {
|
||||
@ -1767,7 +1777,7 @@
|
||||
margin-top: 27rpx;
|
||||
|
||||
.product-item {
|
||||
display: inline-block;
|
||||
display: inline-block;
|
||||
width: 444rpx;
|
||||
height: 136rpx;
|
||||
background: rgba(0, 0, 0, .55);
|
||||
|
||||
|
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
|
||||
} else {
|
||||
this.tabs = this.tabs5
|
||||
this.type=7
|
||||
}
|
||||
|
||||
this.tab(this.type)
|
||||
|
||||
@ -283,6 +283,12 @@
|
||||
去付款
|
||||
</view>
|
||||
</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 ">
|
||||
|
||||
<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
|
||||
|
||||
@ -272,11 +272,16 @@
|
||||
icon: 'none',
|
||||
title: res.message
|
||||
})
|
||||
setTimeout(() => {
|
||||
uni.navigateTo({
|
||||
url:'/pages/users/order_list/index?status=2'
|
||||
if(res.data.status='error'){
|
||||
|
||||
}else{
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({
|
||||
delta: 2
|
||||
})
|
||||
}, 1000)
|
||||
}, 1000)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -118,19 +118,19 @@
|
||||
payStatus: true
|
||||
}
|
||||
// #ifdef H5 ||APP-PLUS
|
||||
,
|
||||
{
|
||||
name: '支付宝支付',
|
||||
icon: 'icon-zhifubao',
|
||||
// #ifdef H5 || APP-PLUS
|
||||
value: 'alipay',
|
||||
// #endif
|
||||
// #ifdef MP
|
||||
value: 'alipayQr',
|
||||
// #endif
|
||||
title: '支付宝支付',
|
||||
payStatus: true
|
||||
}
|
||||
// ,
|
||||
// {
|
||||
// name: '支付宝支付',
|
||||
// icon: 'icon-zhifubao',
|
||||
// // #ifdef H5 || APP-PLUS
|
||||
// value: 'alipay',
|
||||
// // #endif
|
||||
// // #ifdef MP
|
||||
// value: 'alipayQr',
|
||||
// // #endif
|
||||
// title: '支付宝支付',
|
||||
// payStatus: true
|
||||
// }
|
||||
// #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>
|
||||
// +----------------------------------------------------------------------
|
||||
import app from "./app";
|
||||
import storage from "./storage.js";
|
||||
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));
|
||||
});
|
||||
}
|
||||
if (ret.event == 'log') {
|
||||
// console.log('2222222')
|
||||
|
||||
console.log('收到小程序事件: ' + JSON.stringify(ret));
|
||||
}
|
||||
});
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user