mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库样式修改

Browse Source
This commit is contained in:
THK3121 2023-07-08 10:46:55 +08:00
parent 222d240bd7
commit 133493ecb8
7 changed files with 1035 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,7 +265,11 @@
id:id, id:id,
type:number type:number
} }
this.getIndex(); this.$nextTick(()=>{
this.where.is_verify = 1;
delete this.where.status;
this.init();
})
postconfirm(this.merId,data).then(res=>{ postconfirm(this.merId,data).then(res=>{
console.log(res); console.log(res);
}) })

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

@ -3,9 +3,8 @@
<view class="order-index" ref="container"> <view class="order-index" ref="container">
<view class="header"> <view class="header">
<div class="header_count"> <div class="header_count">
<swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4" <swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4" indicator-active-color="#E93323"
indicator-active-color="#E93323" previous-margin="0" next-margin="0" :current="swiperCur" previous-margin="0" next-margin="0" :current="swiperCur" @change="swiperChange">
@change="swiperChange">
<block> <block>
<swiper-item :class="{ active: 0 == swiperCur }"> <swiper-item :class="{ active: 0 == swiperCur }">
<view class="slide-navigator"> <view class="slide-navigator">
@ -14,29 +13,25 @@
</image> </image>
<text class="text">添加商品</text> <text class="text">添加商品</text>
</view> </view>
<navigator class="item" <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_sales.png"> <image mode='widthFix' class="image" src="../static/images/product_sales.png">
</image> </image>
<text class="text">在售商品</text> <text class="text">在售商品</text>
</navigator> </navigator>
<navigator class="item" <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_out.png"> <image mode='widthFix' class="image" src="../static/images/product_out.png">
</image> </image>
<text class="text">售罄商品</text> <text class="text">售罄商品</text>
</navigator> </navigator>
<navigator class="item" <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_recycle.png"> <image mode='widthFix' class="image" src="../static/images/product_recycle.png">
</image> </image>
<text class="text">回收站</text> <text class="text">回收站</text>
</navigator> </navigator>
<navigator class="item" <navigator class="item" :url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
:url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
hover-class='none'> hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_cate.png"> <image mode='widthFix' class="image" src="../static/images/product_cate.png">
</image> </image>
@ -46,18 +41,15 @@
</swiper-item> </swiper-item>
<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'>
<image mode='widthFix' class="image" <image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
src="../static/images/product_specification.png"></image>
<text class="text">规格模板</text> <text class="text">规格模板</text>
</navigator> </navigator>
</view> </view>
@ -100,20 +92,16 @@
</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 v-if="item.is_show == 1 && item.status == 1" class="bnt" <view v-if="item.is_show == 1 && item.status == 1" class="bnt" @tap.stop="handleShelves(item,0)">下架
@tap.stop="handleShelves(item,0)">下架
</view> </view>
<view v-if="item.is_show == 0 && item.status == 1" class="bnt" <view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架
@tap.stop="handleShelves(item),1">上架
</view> </view>
<view @click="editGoods(item)" class="bnt">编辑</view> <view @click="editGoods(item)" class="bnt">编辑</view>
<navigator <navigator :url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'"
:url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'"
class="bnt" hover-class='none'>预览</navigator> class="bnt" hover-class='none'>预览</navigator>
<view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除 <view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
</view> </view>
<view class="bnt bnt_recommend" v-if="item.is_show == 1" <view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">
@tap.stop="handleRecommend(item)">
{{item.is_good ? '取消推荐' : '店铺推荐'}} {{item.is_good ? '取消推荐' : '店铺推荐'}}
</view> </view>
</view> </view>
@ -124,18 +112,19 @@
</view> </view>
<Loading :loaded="loaded" :loading="loading"></Loading> <Loading :loaded="loaded" :loading="loading"></Loading>
</view> </view>
<u-popup :show="show" @close="close" mode="center"> <u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
<image src="" mode=""></image> <image src="@/static/images/xianxia.png" mode="widthFix"></image>
<view class="popen" > <view class="popen">
<h4 v-if="this.on_line==1">线下入库</h4> <h4 v-if="this.on_line==1">线下入库</h4>
<h4 v-else>线上入库</h4> <h4 v-else>线上入库</h4>
<view class="guige"> <view class="guige" >
<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange" > <u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1" @change="radioChange(item)" <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
:key="index" :label="item.sku" :name="item.unique" v-if="item.sku"> @change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
<view class="shuru"> <view class="shuru">
数量: <input type="text" v-model="data.number" placeholder="请输入"> 数量: <input type="text" v-model="data.number" placeholder="请输入">
</view> </view>
@ -194,7 +183,7 @@
productList: [], productList: [],
swiperCur: 0, swiperCur: 0,
circular: true, circular: true,
attrValue:[], attrValue: [],
options: [{ options: [{
value: '0', value: '0',
text: '线上入库' text: '线上入库'
@ -210,12 +199,12 @@
checkboxValue1: [], checkboxValue1: [],
// 基本案列数据 // 基本案列数据
checkboxList1: [], checkboxList1: [],
data:{ data: {
product_id: '', product_id: '',
unique: "", unique: "",
number: '' number: ''
}, },
on_line:'' on_line: ''
} }
}, },
onLoad(options) { onLoad(options) {
@ -230,7 +219,7 @@
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onHide() { onHide() {
this.show=false this.show = false
}, },
methods: { methods: {
menuAction(action, rowId) { menuAction(action, rowId) {
@ -240,30 +229,30 @@
} }
this.on_line = action this.on_line = action
console.log(this.on_line); console.log(this.on_line);
this.checkboxList1=rowId this.checkboxList1 = rowId
this.show=true this.show = true
}, },
close() { close() {
this.show = false this.show = false
}, },
//导入 //导入
creat(){ creat() {
if(this.on_line == 1){ if (this.on_line == 1) {
postImport(this.mer_id,this.data).then(res=>{ postImport(this.mer_id, this.data).then(res => {
console.log(res); console.log(res);
this.show=false this.show = false
this.$util.Tips({ this.$util.Tips({
title: res.message title: res.message
}) })
}) })
} }
if(this.on_line == 0){ if (this.on_line == 0) {
console.log('12'); console.log('12');
navigateTo(1,'/pages/users/online_warehousing/index', { navigateTo(1, '/pages/users/online_warehousing/index', {
mer_id: this.mer_id, mer_id: this.mer_id,
product_id:this.data.product_id, product_id: this.data.product_id,
unique:this.data.unique, unique: this.data.unique,
}); });
} }
@ -272,11 +261,11 @@
//规格 //规格
checkboxChange(n) { checkboxChange(n) {
console.log('change', n); console.log('change', n);
this.data.unique=n this.data.unique = n
}, },
radioChange(n){ radioChange(n) {
console.log(n); console.log(n);
this.data.product_id=n.product_id this.data.product_id = n.product_id
console.log(this.data); console.log(this.data);
}, },
// 跳转添加商品界面 // 跳转添加商品界面
@ -698,45 +687,69 @@
border-radius: 10px; border-radius: 10px;
width: 30px; width: 30px;
height: 10px; height: 10px;
.gen_sel { .gen_sel {
font-size: 12px font-size: 12px
} }
} }
.popen{
.popen {
position: absolute;
top: 110px;
width: 100%;
margin: auto; margin: auto;
padding: 10px; padding: 10px;
h4{
h4 {
font-weight: 400;
font-size: 20px;
padding: 5px; padding: 5px;
text-align: center; text-align: center;
} }
.shuru{
.guige {
margin: 10px 0 10px 20px;
}
.guiges {
height: 100px;
margin: 10px 0 10px 20px;
}
.shuru {
display: flex; display: flex;
justify-content: center; justify-content: flex-start;
align-items: center; align-items: center;
padding: 5px; padding: 5px;
input{ margin-left: 20px;
input {
background: #F5F5F5;
border-radius: 8px 8px 8px 8px;
border: 1px solid #999999; border: 1px solid #999999;
padding-left: 3px; padding-left: 3px;
margin-left: 3px; margin-left: 3px;
} }
} }
.btn{
.btn {
display: flex; display: flex;
justify-content: space-around; justify-content: flex-start;
align-items: center; align-items: center;
margin: 5px; margin: 10px;
.btn_l{
.btn_l {
padding: 5px; padding: 5px;
width: 100px; width: 100px;
border-radius: 4px; border-radius: 4px;
background-color: #999999;
} }
.btn_r{
.btn_r {
width: 100px; width: 100px;
padding: 5px; padding: 5px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #999999; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
border-radius: 27px 27px 27px 27px;
color: white;
} }
} }
} }

81
pages/users/online_warehousing/index.vue
View File

@ -43,7 +43,19 @@
</view> </view>
</block> </block>
</view> </view>
<u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
<image src="@/static/images/xianshang.png" mode="widthFix"></image>
<view class="popen">
<h4>{{title}}</h4>
<view class="shuru">
点击返回，商品管理
</view> </view>
<view class="btn">
<button class="btn_l" @click="close()">取消</button>
<button class="btn_r" @click="getback()">确定</button>
</view>
</view>
</u-popup>
</view> </view>
</template> </template>
@ -76,7 +88,9 @@
order_id: '', order_id: '',
order_product_id: '', order_product_id: '',
order_unique: '' order_unique: ''
} },
show: false,
title:''
} }
}, },
onLoad(option) { onLoad(option) {
@ -113,18 +127,22 @@
this.data.order_id = order_id this.data.order_id = order_id
this.data.order_product_id = product_id this.data.order_product_id = product_id
this.data.order_unique = unique this.data.order_unique = unique
this.show = true
postImport(this.mer_id, this.data).then(res => { postImport(this.mer_id, this.data).then(res => {
console.log(res); console.log(res);
this.title=res.message
this.$util.Tips({ this.$util.Tips({
title: res.message title: res.message
}) })
setTimeout(() => { })
},
close() {
this.show = false
},
getback(){
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}); });
}, 1000)
})
} }
} }
} }
@ -223,8 +241,9 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 50rpx; border-radius: 50rpx;
border: 1px solid #999999;
font-size: 27rpx; font-size: 27rpx;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
color: white;
} }
} }
@ -273,4 +292,54 @@
margin: 0 0 50rpx 120rpx; margin: 0 0 50rpx 120rpx;
} }
} }
.popen {
position: absolute;
top: 110px;
width: 100%;
margin: auto;
padding: 10px;
h4 {
font-weight: 400;
font-size: 20px;
padding: 5px;
text-align: center;
}
.guige {
margin: 10px 0 10px 20px;
}
.shuru {
display: flex;
justify-content: center;
align-items: center;
font-size: 18px;
padding: 5px;
}
.btn {
display: flex;
justify-content: flex-start;
align-items: center;
margin: 10px;
.btn_l {
padding: 5px;
width: 100px;
border-radius: 4px;
}
.btn_r {
width: 100px;
padding: 5px;
border-radius: 4px;
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
border-radius: 27px 27px 27px 27px;
color: white;
}
}
}
</style> </style>

4
pages/users/order_confirm/index.vue
View File

@ -653,6 +653,7 @@
order_key: '', order_key: '',
is_take: '', is_take: '',
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
product_type:''
}; };
}, },
computed: { computed: {
@ -670,6 +671,7 @@
onReady() {}, onReady() {},
mounted: function() {}, mounted: function() {},
onLoad: function(options) { onLoad: function(options) {
this.product_type=options.product_type
this.seckillId = options.seckillId this.seckillId = options.seckillId
// #ifdef H5 // #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
@ -1201,7 +1203,7 @@
callback_key = res.data.result.pay_key, callback_key = res.data.result.pay_key,
jsConfig = res.data.result.config, jsConfig = res.data.result.config,
goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message, goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message,
goPagesOrder='/pages/order_details/stay?order_id=' + orderId+'&credit_buy=1'; goPagesOrder='/pages/order_details/stay?order_id=' + orderId+'&credit_buy=1&product_type='+that.product_type ;
that.orderPay = true; that.orderPay = true;
uni.hideLoading(); uni.hideLoading();
switch (status) { switch (status) {

12
pages/users/order_list/index.vue
View File

@ -21,7 +21,7 @@
<view>全部</view> <view>全部</view>
<view class='num'>{{orderData.all || 0}}</view> <view class='num'>{{orderData.all || 0}}</view>
</view> </view>
<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)"> <view class='item' :class='orderStatus==20 ? "on": ""' @click="statusClick(20)">
<view>待付款</view> <view>待付款</view>
<view class='num'>{{orderData.noPay || 0}}</view> <view class='num'>{{orderData.noPay || 0}}</view>
</view> </view>
@ -416,7 +416,8 @@
id: '' id: ''
}, },
//商品分类 //商品分类
activity_type: '' activity_type: '',
product_type:''
}; };
}, },
computed: { computed: {
@ -499,6 +500,7 @@
*/ */
onLoad: function(options) { onLoad: function(options) {
if (options.status) this.orderStatus = options.status; if (options.status) this.orderStatus = options.status;
if (options.product_type) this.product_type = options.product_type;
}, },
/** /**
* 获取订单统计数据 * 获取订单统计数据
@ -507,7 +509,7 @@
getOrderData: function() { getOrderData: function() {
let that = this; let that = this;
orderData({ orderData({
product_type:this.product_type product_type:that.product_type
}).then(res => { }).then(res => {
that.$set(that, 'orderData', res.data); that.$set(that, 'orderData', res.data);
}) })
@ -661,10 +663,11 @@
that.loadTitle = "加载更多"; that.loadTitle = "加载更多";
if (that.isReady) { if (that.isReady) {
that.isReady = false that.isReady = false
if (that.orderStatus == 0) { if (that.orderStatus == 20) {
groupOrderList({ groupOrderList({
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
product_type:that.product_type
}).then(res => { }).then(res => {
console.log(res); console.log(res);
that.isReady = true; that.isReady = true;
@ -686,6 +689,7 @@
status: that.orderStatus - 1, status: that.orderStatus - 1,
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
product_type:that.product_type
}).then(res => { }).then(res => {
console.log(res); console.log(res);
let list = res.data.list || []; let list = res.data.list || [];

BIN
static/images/xianshang.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 45 KiB

BIN
static/images/xianxia.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB