mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面更新

This commit is contained in:
jia 2023-10-07 10:03:29 +08:00
parent 3b71a23fbc
commit 6ba160e97f
18 changed files with 1302 additions and 1245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
App.vue
View File

@ -15,9 +15,15 @@
import { import {
checkLogin checkLogin
} from "./libs/login"; } from "./libs/login";
import {
getUserInfo
} from '@/api/user.js';
import { import {
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from './config/app'; } from './config/app';
import { import {
getconfig, getconfig,
history history
@ -79,12 +85,12 @@
let appkey = uni.getStorage({ let appkey = uni.getStorage({
key: 'launchFlag' key: 'launchFlag'
}) })
if (appkey) {
setTimeout(() => {
this.$store.dispatch('INIT_CONFIG');
}, 6000)
}
if (option.referrerInfo?.extraData?.uniMP) {
uni.setStorageSync('uniMP', option.referrerInfo?.extraData?.uniMP);
uni.setStorageSync('APP_token', option.referrerInfo?.extraData?.token);
}
// #ifdef APP-PLUS // #ifdef APP-PLUS
// #endif // #endif

4
pages.json
View File

@ -83,6 +83,7 @@
"path": "pages/moreProject/moreProject", "path": "pages/moreProject/moreProject",
"style": { "style": {
"navigationBarTitleText": "更多功能", "navigationBarTitleText": "更多功能",
"navigationStyle": "custom",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
@ -103,12 +104,11 @@
"path" : "pages/margin/margin", "path" : "pages/margin/margin",
"style" : "style" :
{ {
"navigationBarTitleText": "保证金缴纳", "navigationBarTitleText": "缴纳保证金",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
// { // {
// "path": "pages/gather/gather", // "path": "pages/gather/gather",
// "style": { // "style": {

5
pages/admin/orderDetail/index.vue
View File

@ -376,8 +376,11 @@
/*核销订单*/ /*核销订单*/
goCancellation() { goCancellation() {
let that = this; let that = this;
// uni.navigateTo({
// url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
// })
uni.navigateTo({ uni.navigateTo({
url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code, url: `/pages/admin/order_cancellation/index?mer_id=${that.mer_id}`
}) })
// uni.showModal({ // uni.showModal({
// title: '订单核销', // title: '订单核销',

1
pages/admin/orderList/index.vue
View File

@ -553,6 +553,7 @@
uni.navigateTo({ uni.navigateTo({
url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
}) })
}, },
toRefundDetail(item) { toRefundDetail(item) {
uni.navigateTo({ uni.navigateTo({

5
pages/columnGoods/goods_search_con/index.vue
View File

@ -5,9 +5,10 @@
<view class="back" @click='set_where(1)'> <view class="back" @click='set_where(1)'>
<view class="iconfont icon-xiangzuo"></view> <view class="iconfont icon-xiangzuo"></view>
</view> </view>
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text> <view class='input acea-row row-between-wrapper'>
<text class='iconfont icon-sousuo'></text>
<input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search" <input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
:value='where.keyword' @confirm="searchSubmit" @input="inputChange"></input> :value='where.keyword' @confirm="searchSubmit" @input="inputChange">
</view> </view>
<view style="text-align: right;" v-if="tabIndex==1" class='iconfont' <view style="text-align: right;" v-if="tabIndex==1" class='iconfont'
:class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view> :class='is_switch==true?"icon-pailie":"icon-tupianpailie"' @click='Changswitch'></view>

15
pages/index/index.vue
View File

@ -241,7 +241,7 @@
<image src="@/static/images/close.png" mode=""></image> <image src="@/static/images/close.png" mode=""></image>
</view> </view>
<form report-submit='true' style="height: 90%;"> <form report-submit='true' style="height: 100%;">
<view class='merchantsSettled' :style="{'height':Fheight}"> <view class='merchantsSettled' :style="{'height':Fheight}">
<view class="title">填写信息</view> <view class="title">填写信息</view>
<view class='list'> <view class='list'>
@ -254,7 +254,6 @@
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">联系电话:</text> <text class="item-name">联系电话:</text>
@ -865,7 +864,11 @@
}, },
//路由跳转 //路由跳转
navation(item) { navation(item) {
if(item.type==8){
uni.navigateTo({
url: '/pages/moreProject/moreProject'
})
}
if (this.userid) { if (this.userid) {
if (this.userInfoData.mer_info.setting_status == 1) { if (this.userInfoData.mer_info.setting_status == 1) {
switch (item.type) { switch (item.type) {
@ -913,11 +916,7 @@
}) })
break; break;
case 8:
uni.navigateTo({
url: '/pages/moreProject/moreProject'
})
break;
} }
} else { } else {

59
pages/margin/margin.vue
View File

@ -8,6 +8,10 @@
<text>已缴纳保证金</text> <text>已缴纳保证金</text>
<text>{{merchant_Data.paid_margin}}</text> <text>{{merchant_Data.paid_margin}}</text>
</view> </view>
<view class="item">
<text>剩余缴纳保证金</text>
<text>{{merchant_Data.unpaid_margin}}</text>
</view>
<view class="item"> <view class="item">
<text>缴纳店铺账户</text> <text>缴纳店铺账户</text>
<text>{{merchant_Data.mer_name}}</text> <text>{{merchant_Data.mer_name}}</text>
@ -21,7 +25,7 @@
</view> </view>
<button class="btn" @click="paydecimal">缴纳</button> <button class="btn" @click="paydecimal">缴纳</button>
</view> </view>
<!-- <view class="tip"> <!-- <view class="tip">
<view class="title">注意事项</view> <view class="title">注意事项</view>
<view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text> <view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
</view> </view>
@ -48,13 +52,13 @@
export default { export default {
data() { data() {
return { return {
mer_id:0, mer_id: 0,
merchant_Data: {}, merchant_Data: {},
where:{ where: {
page:1, page: 1,
limit:10 limit: 10
}, },
productList:[], productList: [],
loadend: false, loadend: false,
loading: false, loading: false,
loadTitle: '加载更多', loadTitle: '加载更多',
@ -63,7 +67,7 @@
onLoad(e) { onLoad(e) {
this.mer_id = e.mer_id this.mer_id = e.mer_id
this.decimal() this.decimal()
this.list(false) this.list(true)
}, },
onReachBottom() { onReachBottom() {
@ -74,7 +78,7 @@
} }
}, },
methods: { methods: {
list(isPage){ list(isPage) {
let that = this; let that = this;
if (that.loadend) return; if (that.loadend) return;
if (that.loading) return; if (that.loading) return;
@ -93,7 +97,7 @@
that.$set(that, 'productList', productList); that.$set(that, 'productList', productList);
}, 500) }, 500)
// console.log(that.productList)
that.$set(that.where, 'page', that.where.page + 1); that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => { }).catch(err => {
@ -117,23 +121,32 @@
title: '暂时无需缴纳保证金' title: '暂时无需缴纳保证金'
}); });
} else { } else {
let that = this
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金', content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
success: function(res) { success: (res) => {
if (res.confirm) { if (res.confirm) {
// console.log('用户点击确定'); // console.log('用户点击确定');
paymerchant().then((res) => { paymerchant().then((res) => {
console.log(res.data)
uni.requestPayment({ uni.requestPayment({
provider: 'wxpay', provider: 'wxpay',
orderInfo: res.data orderInfo: res.data
.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
success: function(res) { success: (res) => {
console.log('success:' + JSON.stringify(res)); this.$util.Tips({
title: '支付成功'
});
this.decimal()
this.list(true)
}, },
fail: function(err) { fail: (err) => {
this.$util.Tips({
title: '支付失败'
});
console.log('fail:' + JSON.stringify(err)); console.log('fail:' + JSON.stringify(err));
} }
}); });
@ -160,16 +173,18 @@
page { page {
background-color: #fff; background-color: #fff;
} }
.content-order{
.content-order {
background: #F4F4F4; background: #F4F4F4;
border-radius: 21rpx 21rpx ; border-radius: 21rpx 21rpx;
margin-top: 30rpx; margin-top: 30rpx;
padding: 10rpx; padding: 10rpx;
margin-left: 10rpx; margin-left: 10rpx;
margin-right: 10rpx; margin-right: 10rpx;
view{
view {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
@ -177,7 +192,8 @@
margin: 20rpx; margin: 20rpx;
} }
} }
.info { .info {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -224,7 +240,8 @@
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
margin-bottom: 10rpx; margin-bottom: 10rpx;
text:nth-child(1){
text:nth-child(1) {
flex-shrink: 0; flex-shrink: 0;
margin-right: 18rpx; margin-right: 18rpx;
} }
@ -236,7 +253,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 28rpx; padding: 0 28rpx;
margin-top: 50rpx; margin-top: 85rpx;
.title { .title {
font-size: 32rpx; font-size: 32rpx;

10
pages/moreProject/moreProject.vue
View File

@ -459,7 +459,7 @@
<image src="@/static/images/close.png" mode=""></image> <image src="@/static/images/close.png" mode=""></image>
</view> </view>
<form report-submit='true' style="height: 90%;"> <form report-submit='true' style="height: 100%;">
<view class='merchantsSettled' :style="{'height':Fheight}"> <view class='merchantsSettled' :style="{'height':Fheight}">
<view class="title">填写信息</view> <view class="title">填写信息</view>
<view class='list'> <view class='list'>
@ -897,11 +897,17 @@
} }
} }
} else { } else {
if(t=='商品管理'){
uni.switchTab({
url: url
})
}else{
uni.navigateTo({ uni.navigateTo({
url: url url: url
}) })
} }
}
}, },
getUserInfo: function() { getUserInfo: function() {
let that = this; let that = this;

2
pages/product/addGoods/addGoodDetils.vue
View File

@ -32,7 +32,7 @@
getProductContent(obj) { getProductContent(obj) {
// console.log(obj); // console.log(obj);
this.goodsDis = obj; this.goodsDis = obj;
this.a=obj.store_name this.a=obj.store_name;
}, },
save() { save() {
setStorage('goodsDis', this.goodsDis); setStorage('goodsDis', this.goodsDis);

141
pages/product/addGoods/index.vue
View File

@ -9,8 +9,8 @@
placeholder-class="inputPlaceHolder" /> placeholder-class="inputPlaceHolder" />
</view> </view>
<view class="input_content_textarea"> <view class="input_content_textarea">
<textarea v-model="setFormData.store_name" placeholder="请输入商品名称" <textarea v-model="setFormData.store_name" placeholder="请输入商品名称" placeholder-class="placeholderStyle"
placeholder-class="placeholderStyle" maxlength="60" /> maxlength="60" />
<view> <view>
<text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text> <text v-if="setFormData.store_name">{{ setFormData.store_name.length }}</text>
<text v-else>0</text> <text v-else>0</text>
@ -20,15 +20,13 @@
<view class="photo_count"> <view class="photo_count">
<text class="photo_size">建议：图片尺寸为750*750px</text> <text class="photo_size">建议：图片尺寸为750*750px</text>
<view class="input_content_photo"> <view class="input_content_photo">
<view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList" <view class="input_content_photo_adPh" v-for="(item, index) in setFormData.imageList" :key="index">
:key="index">
<image :src="item" class="myimg2 photos" @click="pop(item)"></image> <image :src="item" class="myimg2 photos" @click="pop(item)"></image>
<view class="input_content_photo_adPh_jiao" @click="deleteImage(index)"> <view class="input_content_photo_adPh_jiao" @click="deleteImage(index)">
<image src="../static/images/close.png" mode=""></image> <image src="../static/images/close.png" mode=""></image>
</view> </view>
</view> </view>
<view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn" <view v-if="setFormData.imageList.length < 9" class="input_content_photo_adPh addBtn" @click="clk">
@click="clk">
<view> <view>
<image src="../static/images/creamer.png" mode="widthFix"></image> <image src="../static/images/creamer.png" mode="widthFix"></image>
</view> </view>
@ -40,26 +38,6 @@
<image :src="image"></image> <image :src="image"></image>
<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image> <image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
</u-popup> </u-popup>
<view class="input_content_describe">
<view class="input_content_describe_title">
<view class="input_content_describe_title_msg">商品简介</view>
<view class="input_content_describe_title_num">
<text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
<text v-else>0</text>
/200
</view>
</view>
<view class="input_content_describe_textarea">
<textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
placeholderClass="placeholderClass" maxlength="200" />
</view>
</view>
<view class="input_content_keyword">
<view class="input_content_keyword_label">关键字</view>
<view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
placeholder="填写关键字" /></view>
</view>
</view> </view>
<view class="popup_group"> <view class="popup_group">
@ -75,7 +53,7 @@
</view> </view>
</view> </view>
<view class="popup_group_item" @click="selectStoreClass"> <!-- <view class="popup_group_item" @click="selectStoreClass">
<view class="popup_group_item_label">店铺分类</view> <view class="popup_group_item_label">店铺分类</view>
<view class="popup_group_item_value"> <view class="popup_group_item_value">
<view class="popup_group_item_message"> <view class="popup_group_item_message">
@ -85,7 +63,7 @@
</view> </view>
<view><span class="iconfont">&#xe6bd;</span></view> <view><span class="iconfont">&#xe6bd;</span></view>
</view> </view>
</view> </view> -->
<!-- <view class="popup_group_item" @click="selectBrand"> <!-- <view class="popup_group_item" @click="selectBrand">
<view class="popup_group_item_label">商品品牌</view> <view class="popup_group_item_label">商品品牌</view>
@ -106,7 +84,9 @@
</view> </view>
</view> </view>
<view class="popup_group"> <priceComponent :product_id="product_id" v-if="showCommodity"></priceComponent>
<!-- <view class="popup_group">
<view class="radio"> <view class="radio">
<view class="radio_label ">规格选择</view> <view class="radio_label ">规格选择</view>
<radio-group class="select_group flex_start" @change="specificationsRadioChange($event)"> <radio-group class="select_group flex_start" @change="specificationsRadioChange($event)">
@ -154,20 +134,9 @@
<view><span class="iconfont">&#xe6bd;</span></view> <view><span class="iconfont">&#xe6bd;</span></view>
</view> </view>
</view> </view>
</view> </view> -->
<view class="popup_group"> <view class="popup_group">
<view class="radio">
<view class="radio_label ">送货方式</view>
<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
<label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
<view>
<checkbox :value="val.value" disabled :checked="val.value" />
</view>
<view>{{ val.name }}</view>
</label>
</checkbox-group>
</view>
<!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item"> <!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
<view class="popup_group_item_label">是否包邮</view> <view class="popup_group_item_label">是否包邮</view>
@ -179,7 +148,7 @@
</view> </view>
</view> --> </view> -->
<view class="popup_group_item" <!-- <view class="popup_group_item"
v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0" v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"
@click="tempIdSelect"> @click="tempIdSelect">
<view class="popup_group_item_label">运费模板</view> <view class="popup_group_item_label">运费模板</view>
@ -191,10 +160,62 @@
</view> </view>
<view><span class="iconfont">&#xe6bd;</span></view> <view><span class="iconfont">&#xe6bd;</span></view>
</view> </view>
</view> -->
</view>
<commodityComponent v-if="showCommodity" :key="showCommodity" :showCommodity="showCommodity" :resetKey="secoundModel" :product_id="product_id" :merId="merId"
:code="code" @lastStep="lastStep">
</commodityComponent>
<view class="popup_group">
<view class="popup_group_item" @click="showMoreInfo=!showMoreInfo">
<view class="popup_group_item_label">更多信息</view>
<view class="popup_group_item_value" :class="showMoreInfo?'icon_bottom':'icon_top'">
<view><span class="iconfont">&#xe6bd;</span></view>
</view> </view>
</view> </view>
<block v-if="showMoreInfo">
<view class="input_content">
<view class="input_content_describe" style="border-top: none">
<view class="input_content_describe_title">
<view class="input_content_describe_title_msg">商品简介</view>
<view class="input_content_describe_title_num">
<text v-if="setFormData.store_info">{{ setFormData.store_info.length }}</text>
<text v-else>0</text>
/200
</view>
</view>
<view class="input_content_describe_textarea">
<textarea v-model="setFormData.store_info" value="" placeholder="请填写商品简介"
placeholderClass="placeholderClass" maxlength="200" />
</view>
</view>
<view class="input_content_keyword">
<view class="input_content_keyword_label">关键字</view>
<view class="input_content_keyword_value"><input v-model="setFormData.keyword" type="text" value=""
placeholder="填写关键字" /></view>
</view>
</view>
<view class="radio">
<view class="radio_label ">送货方式</view>
<checkbox-group class="select_group flex_start" @change="deliveryWayChange">
<label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
<view>
<checkbox :value="val.value" disabled :checked="val.value" />
</view>
<view>{{ val.name }}</view>
</label>
</checkbox-group>
</view>
</block>
</view>
<view class="handle"> <view class="handle">
<view class="handle_button" @click="handleNextStep">下一步</view> <!-- <view class="handle_button" @click="handleNextStep">下一步</view> -->
<secound :resetKey="secoundModel" :product_id="product_id" :merId="merId" :code="code" @lastStep="lastStep">
</secound>
</view> </view>
</view> </view>
@ -223,9 +244,8 @@
<uni-popup ref="tempId" type="bottom"> <uni-popup ref="tempId" type="bottom">
<linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']" <linkage-assembly selectProductTitle="选择运费模板" :form="setFormData" :classifiedData="classified['temp_id']"
:selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData" :selectProductItem="productItem" :mer_id="merId" @getLinkageData="getTempIdData" @multipleList="multipleList"
@multipleList="multipleList" @close="$refs.tempId.close()" @close="$refs.tempId.close()" @scrolltolower="scrolltolower"></linkage-assembly>
@scrolltolower="scrolltolower"></linkage-assembly>
</uni-popup> </uni-popup>
<uni-popup ref="attr" type="bottom"> <uni-popup ref="attr" type="bottom">
<attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr"> <attr @close="$refs.attr.close()" :mer_id="merId" :attrList="classified['attr']" @selectAttr="selectAttr">
@ -269,6 +289,8 @@
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from '@/config/app.js'; } from '@/config/app.js';
import store from '@/store'; import store from '@/store';
import priceComponent from "./price.vue";
import commodityComponent from "./commodity.vue";
export default { export default {
components: { components: {
inputGoodsDetils, inputGoodsDetils,
@ -277,10 +299,13 @@
platfrom, // 选择平台分类组件 platfrom, // 选择平台分类组件
storeClassification, storeClassification,
secound, secound,
avatar avatar,
priceComponent,
commodityComponent
}, },
data() { data() {
return { return {
showCommodity: false, // 是否显示商品,售价
step: 1, step: 1,
bar_code: '', bar_code: '',
bar_code_dis: false, bar_code_dis: false,
@ -304,12 +329,13 @@
specifica: '', // 商品规格名称 specifica: '', // 商品规格名称
setSpecificaValue: '', // 价格设置提示 setSpecificaValue: '', // 价格设置提示
setSpecificaValue2: '', setSpecificaValue2: '',
delivery_way: [1,2], // 配送方式 1 到店核销 2 快递配送 delivery_way: [1, 2], // 配送方式 1 到店核销 2 快递配送
delivery_free: '1', // 是否包邮 0不包邮 1包邮 delivery_free: '1', // 是否包邮 0不包邮 1包邮
temp_id: '', // 运费模板ID temp_id: '', // 运费模板ID
tempName: '' // 运费模板名称 tempName: '' // 运费模板名称
}, },
popupContainerKey: false, popupContainerKey: false,
showMoreInfo: false,
productItem: {} || [], productItem: {} || [],
selectProductTitle: '选择平台分类', selectProductTitle: '选择平台分类',
specificationsRadioList: [{ specificationsRadioList: [{
@ -402,6 +428,7 @@
// console.log(opt); // console.log(opt);
this.merId = Number(opt.mer_id); this.merId = Number(opt.mer_id);
this.product_id = opt.product_id; this.product_id = opt.product_id;
if(!opt.product_id)this.showCommodity=true;
if (opt.code) { if (opt.code) {
this.code = opt.code; this.code = opt.code;
this.bar_code_dis = true this.bar_code_dis = true
@ -412,6 +439,16 @@
this.initDataEditData(); this.initDataEditData();
} }
}, },
onBackPress() {
let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound', 'editCommodity'
];
waitDeleteData.forEach(item => {
if (getStorage(item)) {
removeStorage(item);
}
});
},
onShow() { onShow() {
this.setFormData.setSpecificaValue = ''; this.setFormData.setSpecificaValue = '';
this.setFormData.setSpecificaValue2 = ''; this.setFormData.setSpecificaValue2 = '';
@ -453,6 +490,7 @@
} }
}, },
methods: { methods: {
//图片预览 //图片预览
pop(e) { pop(e) {
this.show = true this.show = true
@ -546,6 +584,7 @@
} }
productDetail(this.merId, this.product_id).then(res => { productDetail(this.merId, this.product_id).then(res => {
setStorage('editGoodsDetils', res.data); setStorage('editGoodsDetils', res.data);
this.$store.commit('setStorage', res.data);
let editGoodsDetils = res.data; let editGoodsDetils = res.data;
Object.keys(this.setFormData).forEach(item => { Object.keys(this.setFormData).forEach(item => {
this.setFormData[item] = editGoodsDetils[item]; this.setFormData[item] = editGoodsDetils[item];
@ -579,6 +618,8 @@
editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name); editGoodsDetils.temp && (this.setFormData.tempName = editGoodsDetils.temp.name);
setStorage('canChange', true); setStorage('canChange', true);
hideLoading(); hideLoading();
this.showCommodity = true;
}); });
}, },
// 选择图片 // 选择图片
@ -828,6 +869,8 @@
// 开始下一步 // 开始下一步
handleNextStep() { handleNextStep() {
this.step = 2;
return;
// console.log(this.setFormData.setSpecificaValue) // console.log(this.setFormData.setSpecificaValue)
let canJumpFlag = true; let canJumpFlag = true;
let requireData = { let requireData = {
@ -886,10 +929,10 @@
.pop { .pop {
z-index: 1; z-index: 1;
} }
.guanbi { .guanbi {
width: 20px; width: 20px;
height: 20px; height: 20px;
margin: 30px auto; margin: 30px auto;
} }
</style> </style>

10
pages/product/addGoods/scss/index.scss
View File

@ -18,7 +18,7 @@
} }
} }
.tip { .tip {
padding: 16rpx 0 0 40rpx; padding: 16rpx 0 0 20rpx;
font-size: 22rpx; font-size: 22rpx;
color: #e93323; color: #e93323;
display: flex; display: flex;
@ -36,6 +36,14 @@
width: 710rpx; width: 710rpx;
font-size: 30rpx; font-size: 30rpx;
border-radius: 10rpx; border-radius: 10rpx;
.icon_top{
transform: rotate(-90deg);
}
.icon_bottom{
transform: rotate(90deg);
}
.popup_group_item { .popup_group_item {
padding: 32rpx 30rpx; padding: 32rpx 30rpx;
display: flex; display: flex;

42
pages/product/addGoods/secound.vue
View File

@ -1,4 +1,6 @@
<template> <template>
<view>
<block v-if="showComponent">
<view class=" writeBg "> <view class=" writeBg ">
<view class="container_input marginTop_none"> <view class="container_input marginTop_none">
<view class="container_input_item"> <view class="container_input_item">
@ -55,7 +57,8 @@
<video :src="addGoodsSecoundData.video_link"></video> <video :src="addGoodsSecoundData.video_link"></video>
<!--#endif--> <!--#endif-->
<!--#ifdef APP-PLUS--> <!--#ifdef APP-PLUS-->
<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png" style=" width:150rpx" ></img> <img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
style=" width:150rpx"></img>
<!--#endif--> <!--#endif-->
<image src="../static/images/close.png" mode="widthFix"></image> <image src="../static/images/close.png" mode="widthFix"></image>
</view> </view>
@ -108,6 +111,9 @@
<view class="handle_button" @click="submitCreatedGoods">提交</view> <view class="handle_button" @click="submitCreatedGoods">提交</view>
</view> </view>
</view> </view>
</block>
<view class="handle_button" @click="submitCreatedGoods">提交</view>
</view>
</template> </template>
<script> <script>
import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js'; import { TOKENNAME, HTTP_REQUEST_URL } from '@/config/app.js';
@ -148,7 +154,8 @@
}, },
data() { data() {
return { return {
showVideo:false, showComponent: false,
showVideo: false,
disModel: false, disModel: false,
upload_max: 10, upload_max: 10,
uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`, uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
@ -235,7 +242,7 @@
submitCreatedGoods() { submitCreatedGoods() {
Loading(); Loading();
let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData', let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound' 'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils', 'canChange', 'canChangeSecound', 'editCommodity'
]; ];
let attrValue = getStorage('addGoodsFormData').spec_type == 0 ? [getStorage('singleSpecification')] : let attrValue = getStorage('addGoodsFormData').spec_type == 0 ? [getStorage('singleSpecification')] :
getStorage('attrValue'); getStorage('attrValue');
@ -248,12 +255,25 @@
}, },
video_link: this.addGoodsSecoundData.video_link video_link: this.addGoodsSecoundData.video_link
}; };
if (attrValue) {
if(attrValue){
postData.attrValue = attrValue.filter(item => item != ''); postData.attrValue = attrValue.filter(item => item != '');
postData.attrValue[0].bar_code postData.attrValue[0].bar_code
} }
// console.log(postData); 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.trim().length<=0)return Toast('请输入商品名称');
if(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.trim().length<=0)return Toast('请输入商品详情');
if(postData.content.image.length<=0)return Toast('请上传商品图片');
// return Toast('通过');
if (getStorage('addGoodsFormData').spec_type == 0) { if (getStorage('addGoodsFormData').spec_type == 0) {
// postData.attr = [getStorage('singleSpecification')]; // postData.attr = [getStorage('singleSpecification')];
} }
@ -413,6 +433,7 @@
} }
} }
} }
.videoHover { .videoHover {
width: 180rpx; width: 180rpx;
height: 180rpx; height: 180rpx;
@ -439,6 +460,7 @@
} }
} }
} }
.photo { .photo {
border: 1px solid #dddddd; border: 1px solid #dddddd;
opacity: 1; opacity: 1;
@ -481,10 +503,12 @@
height: 150rpx; height: 150rpx;
} }
} }
.preview_video{
.preview_video {
position: absolute; position: absolute;
} }
.container_input { .container_input {
background: #fff; background: #fff;
padding: 0 20rpx; padding: 0 20rpx;
@ -603,6 +627,7 @@
.marginTop_none { .marginTop_none {
margin-top: 0; margin-top: 0;
} }
.video-count { .video-count {
position: fixed; position: fixed;
width: 600rpx; width: 600rpx;
@ -621,6 +646,7 @@
height: 500rpx; height: 500rpx;
} }
} }
// .writeBg { // .writeBg {
// background: #fff; // background: #fff;
// } // }

2
pages/product/addGoods/singleSpecification.vue
View File

@ -14,7 +14,7 @@
<script> <script>
import selectForm from '../components/selectForm.vue'; import selectForm from '../components/selectForm.vue';
import { navigateTo, navigateBack, serialize, setStorage, getStorage} from '../../../libs/uniApi.js'; import { navigateTo, navigateBack, serialize, setStorage, getStorage } from '../../../libs/uniApi.js';
// 单规格商品 attrValue // 单规格商品 attrValue
export default { export default {
components:{ components:{

8
pages/product/basicSet.vue
View File

@ -7,10 +7,8 @@
<view class="store_bg"> <view class="store_bg">
<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view> <view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
<block v-if="images[0].img"> <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="360px" height="210.53rpx" radius="4px" <u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
@click="delImg(2)"></u--image> @click="delImg(0)"></u--image>
</block> </block>
<view v-else class="upload" @click="seleckImage(0)"> <view v-else class="upload" @click="seleckImage(0)">
<view class="iconfont icon-tupian1"></view> <view class="iconfont icon-tupian1"></view>
@ -135,7 +133,7 @@
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话"> <input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
</view> </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> <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> <u-switch v-model="credit_buy" @change="change"></u-switch>
</view> </view>
@ -149,7 +147,7 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %"> <input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
</view> </view>
<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> <view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
<!-- <view class="item_cell"> <!-- <view class="item_cell">
<view class="if_btn flex_a_c_j_sb"> <view class="if_btn flex_a_c_j_sb">
<text class="sub_title">是否开启商户：</text> <text class="sub_title">是否开启商户：</text>

16
pages/product/list/index.vue
View File

@ -47,13 +47,13 @@
<swiper-item :class="{ active: 1 == swiperCur }"> <swiper-item :class="{ active: 1 == swiperCur }">
<view class="slide-navigator"> <view class="slide-navigator">
<!-- 隐藏暂时不需要 --> <!-- 隐藏暂时不需要 -->
<navigator class="item" <!-- <navigator class="item"
:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_freight.png"> <image mode='widthFix' class="image" src="../static/images/product_freight.png">
</image> </image>
<text class="text">运费模板</text> <text class="text">运费模板</text>
</navigator> </navigator> -->
<navigator class="item" <navigator class="item"
:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
hover-class='none'> hover-class='none'>
@ -61,12 +61,12 @@
src="../static/images/product_specification.png"></image> src="../static/images/product_specification.png"></image>
<text class="text">规格模板</text> <text class="text">规格模板</text>
</navigator> </navigator>
<navigator class="item" <!-- <navigator class="item"
:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`" :url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image> <image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
<text class="text">商品导入</text> <text class="text">商品导入</text>
</navigator> </navigator> -->
</view> </view>
</swiper-item> </swiper-item>
</block> </block>
@ -125,9 +125,9 @@
</view> </view>
<view class="operation acea-row row-between-wrapper"> <view class="operation acea-row row-between-wrapper">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx"> <!-- <view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
线上入库 线上入库
</view> </view> -->
<view class="" class="bnt" @click="Fline(item)" style="width:150rpx"> <view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
线下入库 线下入库
</view> </view>
@ -282,7 +282,6 @@
value: '2', value: '2',
text: '预览' text: '预览'
}, },
] ]
} else { } else {
this.options = [{ this.options = [{
@ -302,6 +301,9 @@
text: '删除' text: '删除'
}) })
} }
this.ll++ this.ll++
// console.log(this.ll) // console.log(this.ll)
if (this.ll % 2 == 0) { if (this.ll % 2 == 0) {

3
pages/store/home/index.vue
View File

@ -1077,8 +1077,7 @@
// this.tabs = this.tabs2 // this.tabs = this.tabs2
// this.service_open = false // this.service_open = false
// } // }
if (res.data.business_status == 2) {
if (this.business_status == 1) {
this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3 this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
} else { } else {
this.tabs = this.tabs5 this.tabs = this.tabs5

4
pages/supply_chains/supply_chains.vue
View File

@ -273,6 +273,9 @@
}) })
}, },
onShow() {
this.list(true);
},
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if (this.productList.length > 0) {
setTimeout(() => { setTimeout(() => {
@ -282,7 +285,6 @@
this.list() this.list()
} }
}, },
beforeDestroy() { beforeDestroy() {
// 销毁监听事件 // 销毁监听事件

68
store/modules/app.js
View File

@ -4,12 +4,10 @@ import {
} from "../../api/user.js"; } from "../../api/user.js";
import { import {
LOGIN_STATUS, LOGIN_STATUS,
UID UID,
} from '../../config/cache';
import Cache from '../../utils/cache';
import {
USER_INFO USER_INFO
} from '../../config/cache'; } from '../../config/cache';
import Cache from '../../utils/cache';
// #ifdef APP-PLUS // #ifdef APP-PLUS
import Updater from '@/uni_modules/guyue-updater/index'; import Updater from '@/uni_modules/guyue-updater/index';
// #endif // #endif
@ -18,7 +16,7 @@ const state = {
location: Cache.get('LOCATION_DATA', true) || {}, location: Cache.get('LOCATION_DATA', true) || {},
token: Cache.get(LOGIN_STATUS) || null, token: Cache.get(LOGIN_STATUS) || null,
backgroundColor: "#fff", backgroundColor: "#fff",
userInfo: null, userInfo: Cache.get(USER_INFO) || null,
uid: Cache.get(UID) || null, uid: Cache.get(UID) || null,
globalData: uni.getStorageSync('GLOBAL_DATA') || {}, globalData: uni.getStorageSync('GLOBAL_DATA') || {},
homeActive: false, homeActive: false,
@ -39,6 +37,10 @@ const mutations = {
Cache.set(LOGIN_STATUS, opt.token, opt.time); Cache.set(LOGIN_STATUS, opt.token, opt.time);
uni.removeStorageSync('auth_token'); uni.removeStorageSync('auth_token');
}, },
SET_USERINFO(state, opt) {
state.userInfo = opt;
Cache.set(USER_INFO, opt);
},
SETUID(state, val) { SETUID(state, val) {
state.uid = val; state.uid = val;
Cache.set(UID, val); Cache.set(UID, val);
@ -103,62 +105,6 @@ const actions = {
}).catch(() => { }).catch(() => {
}); });
},
async INIT_CONFIG({
state,
commit
}, data = false) {
const wgt_v = uni.getStorageSync('wgt_version') || '1.0.0';
// #ifdef APP-PLUS
let os = uni.getSystemInfoSync();
let apptype;
if (os.osName == 'ios') {
apptype = 2
} else {
apptype = 1
}
Appversion({
version: os.appWgtVersion,
type: apptype,
phone_brand:os.brand
}).then((res) => {
if (Object.keys(res.data.appInfo).length > 0) {
// if(res.data.appInfo.version) uni.showLoading({
// title: '检查更新中'
// })
// 版本更新
if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
compareVersions(res.data.appInfo.version,
wgt_v) == 1) {
try {
let info = res.data.appInfo || {};
let version = {
title: info.title || '发现新版本',
content: info.content || '修复了部分BUG',
versionName: info.version || '1.0.1',
brand:res.data.appInfo.phone_brand,
downUrl: info.dow_url || '',
force: info.force == 1 ? true : false, // 是否强制更新
quiet: info.quiet == 1 ? true : false // 是否静默更新
}
Updater.update(version,res.data.appInfo);
} catch (e) {
console.log(e);
}
// uni.hideLoading();
}
}
}).catch((err) => {
// console.log(err)
})
// #endif
} }
}; };