Skip to content

L
lumastoreapp
Commit 72693add authored by xieyishang's avatar xieyishang
Browse files
Options

addxx

parent 1ca458e3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1114 additions and 2107 deletions
components/aui-picker/aui-picker.vue 0 → 100644
View file @ 72693add
This diff is collapsed.
components/aui-picker/aui.css 0 → 100644
View file @ 72693add
This diff is collapsed.
pages.json
View file @ 72693add
......@@ -347,13 +347,6 @@
"style": {
"navigationBarTitleText": "外卖配送费设置"
}
}, {
"path": "pages/details/details",
"style": {
//机型列表
"navigationBarTitleText": "大转盘",
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "pages/myStore/delivery",
"style": {
......
pages/details/details.scss deleted 100644 → 0
View file @ 1ca458e3
.head {
margin: 24upx;
height: 150upx;
background-color: #ffffff;
border-radius: 10upx;
.flex1 {
margin: auto;
.head_1 {
width: 120upx;
height: 120upx;
margin: 0 40upx 0 20upx;
}
}
.head_2 {
flex: 3;
align-items: center;
justify-content: center;
.head_2_1 {
margin: 24upx 0 24upx 0;
font-size: 30upx;
font-weight: bold;
}
.head_2_2 {
font-size: 30upx;
font-weight: bold;
// display: flex;
.head_2_1 {
margin: 0 40upx 0 0;
background-color: #f64f15;
border-radius: 10upx;
padding: 4upx 10upx 4upx 10upx;
color: #ffffff;
}
}
}
}
// 2222222
.head_1 {
margin: 24upx;
.bonus {
font-size: 36upx;
font-weight: bold;
padding: 24upx;
color: #f64f15;
}
.bonus_1 {
background-color: #ffffff;
.bonus_1_1 {
padding: 20upx;
display: flex;
align-items: center;
.bonus_1_1_1{
font-size:28upx;
flex: 2;
// color: #f64f15;
font-weight: bold;
}
.bonus_1_1_1_1{
margin-left: 30upx;
flex: 4;
}
.nome{
display: none;
}
.input_1{
flex: 1;
font-size: 28upx;
font-weight: bold;
}
}
.bonus_1_2 {
padding: 20upx;
display: flex;
}
}
.input{
font-size: 28upx;
}
.bonus_2 {
height: 320upx;
background-color: #ffffff;
display: flex;
justify-content: center;
.bonus_img {
width: 100upx;
height: 80upx;
}
.bonus_2_1 {
margin: 10upx;
font-weight: bold;
font-size: 32upx;
color: rgba(102, 102, 102, 1);
}
}
}
.bonus_3 {
height: 160upx;
align-items: center;
.bonus_1_2 {
width: 50upx;
height: 50upx;
}
.bonus_3_1 {
margin-top: 10upx;
}
.bonus_3_2 {
margin: 0 20upx 0 20upx;
font-size: 32upx;
font-weight: 600;
}
}
.inputbox{
position: relative;
width:250upx;
// height:72upx;
border:1px solid rgba(181,181,181,1);
margin-left: 20upx;
.jiantouicon{
position: absolute;
top: 4px;
right: 8upx;
width: 22upx;
height: 24upx;
}
}
.bonus_4 {
height: 720upx;
background-color: #ffffff;
padding-left: 24rpx;
.box{
display: flex;
align-items: center;
.box_1{
font-size: 28upx;
// color: #f64f15;
font-weight: bold;
}
}
.box_2{
font-size:28upx;
font-weight: bold;
}
.bonus_4_1 {
padding: 20upx;
// border-bottom: 2upx solid red;
}
}
.bonus_5 {
// height: 80rpx;
line-height: 80upx;
background-color: #f64f15;
border-radius: 10upx;
text-align: center;
margin-top: 100upx;
}
.bonus_5_1 {
color: #ffffff;
font-weight: bold;
background-color: #f64f15;
}
// 列表
image {
width: 100%;
height: 100%;
}
.ali-f {
display: flex;
align-items: flex-end;
}
.goods_item {
// display: flex;
margin-bottom: 10upx;
border-radius: 14upx;
background: #ffffff;
padding: 24upx;
// box-sizing: border-box;
// margin: 80upx;
// width: 100%;
// height:506upx;
.thumbnail {
width: 200upx;
height: 200upx;
position: relative;
.pmimg {
width: 200upx;
height: 200upx;
position: absolute;
left: 10upx;
top: 0;
margin: 0 20upx 0 0;
}
}
.body_goods {
position: relative;
padding: 0 0 0 30upx;
flex: 1;
.shopname {
color: rgba(0, 0, 0, 1);
margin-bottom: 20upx;
font-weight: bold;
font-size: 32upx;
.twoline_s {
font-weight: bold;
font-size: 32upx;
margin: 0 20upx 0 0;
}
}
.flexbox {
display: flex;
align-items: center;
}
.hongkng {
font-size: 32upx;
font-weight: 500;
line-height: 32upx;
}
.hongkngs {
padding: 0 10upx;
height: 32upx;
background-color: #ff6900;
border-radius: 6upx;
font-size: 22upx;
font-weight: 400;
color: #ffffff;
line-height: 36upx;
text-align: center;
margin-right: 20upx;
margin-bottom: 10upx;
}
.gmbtnimg {
width: 36upx;
height: 36upx;
}
.gmbtn {
width: 144upx;
height: 44upx;
background: rgba(255, 0, 0, 1);
border-radius: 6upx;
font-size: 30upx;
font-weight: 400;
color: rgba(255, 255, 255, 1);
line-height: 44upx;
text-align: center;
}
.goods_foot {
position: absolute;
padding: 0 0 0 30upx;
box-sizing: border-box;
width: 100%;
bottom: 0;
left: 0;
.prciebox {
color: #f64f15;
.fuhao {
font-size: 26upx;
line-height: 110%;
}
.shuzi {
font-size: 34upx;
font-weight: bold;
line-height: 110%;
padding: 10upx 30upx 10upx 30upx;
border-radius: 10upx;
background-color: rgb(252, 204, 187);
color: #f64f15;
}
}
.xiaol {
font-size: 26upx;
color: rgba(153, 153, 153, 1);
margin-left: 10upx;
text-decoration: line-through;
line-height: 110%;
}
}
}
}
.base {
height: 100upx;
background: #ffffff;
border-radius: 6upx;
// margin: 24upx;
display: flex;
justify-content:space-between;
align-items: center;
// padding: 24upx;
font-weight: bold;
font-size: 32rpx;
.base_1{
background-color: rgb(252, 204, 187);
color: #f64f15;
padding: 10upx 30upx 10upx 30upx;
border-radius: 10upx;
}
.opa{
opacity: 0.6;
}
}
.gmbtns{
width: 160upx;
height: 50upx;
background: #f64f15;
border-radius: 6upx;
font-size: 30upx;
font-weight: 400;
color: #ffffff;
line-height: 50upx;
text-align: center;
padding: 0;
}
.message{
}
\ No newline at end of file
pages/details/details.vue deleted 100644 → 0
View file @ 1ca458e3
This diff is collapsed.
pages/edit/product/addshop.vue
View file @ 72693add
This diff is collapsed.
pages/index/index.vue
View file @ 72693add
......@@ -248,14 +248,6 @@
</navigator>
</view>
<view class="jiu_max " @tap="shops" v-if="shop_type == 'ele'">
<view class="jiu_min">
<view>
<image class="img" src="/static/news/turntable.png" mode=""></image>
</view>
<view>大转盘</view>
</view>
</view>
<view class="jiu_max " v-if="shop_type == 'ele'">
<navigator url="/pages/deliveryCost/deliveryCost">
......@@ -593,11 +585,6 @@
})
},
shops() {
uni.navigateTo({
url: "/pages/details/details?shop_id=" + this.shop_id
})
},
download() {
let that = this
uni.showModal({
......
pages/myStore/delivery.vue
View file @ 72693add
......@@ -93,13 +93,8 @@
content: res.msg,
showCancel: false,
success(res) {
uni.redirectTo({
url: '/pages/details/details'
})
// uni.navigateBack({
// //delta: 2
// });
uni.navigateBack({
});
}
})
}else{
......
pages/order/shopOrder.vue
View file @ 72693add
......@@ -250,7 +250,6 @@ export default {
},
//标题栏变点击
onNavigationBarButtonTap(e){
// console.info("eeee",e);
if(e.index==0){
//显示高级搜索
this.isshowsearch = !this.isshowsearch;
......@@ -287,7 +286,6 @@ export default {
}
},
onLoad(options) {
// console.log(options)
var that = this;
this.statusTab = options.current ? options.current : 'all'; // 订单状态
this.status = options.status ? options.status : 'all';
......@@ -403,9 +401,9 @@ export default {
confirmColor: '#ff6900',
success: res => {
if (res.confirm) {
console.log('用户点击确定');
//用户点击确定
} else if (res.cancel) {
console.log('用户点击取消');
//用户点击取消
}
}
});
......@@ -428,8 +426,6 @@ export default {
this.currentTab = event.target.dataset.current;
this.pageNum = 0;
console.log(this.refundOrder,'aaaa');
this.initializedata();
},
// 拒绝退款原因关闭弹窗
......@@ -447,7 +443,6 @@ export default {
return;
}
shopExamine(params).then(res => {
// console.log(res)
if (res.code == 0) {
uni.$emit('isDelorder', { action: 'shopExamine' });
......@@ -487,12 +482,12 @@ export default {
this.is_loading_done = true;
this.$api.msg('没有更多了~');
} else {
this.refundOrder = res.data;
this.refundOrder = [...this.refundOrder,...res.data];
}
uni.pageScrollTo({
scrollTop: uni.getStorageSync('scrollTop'),
duration: 0
});
// uni.pageScrollTo({
// scrollTop: uni.getStorageSync('scrollTop'),
// duration: 0
// });
});
return;
}
......@@ -508,7 +503,6 @@ export default {
tel:this.tel,
};
orderList(params).then(res => {
console.info("res",res);
uni.stopPullDownRefresh();
uni.hideLoading(); //结束加载
if (res.data == null || res.data.length == 0) {
......@@ -540,18 +534,14 @@ export default {
switch (action) {
case 'oneKeyCancel': //一键核销 OK
that.requestOrder(order_id, action);
console.info('一键核销');
break;
case 'oneKeyShipments': //一键发货 OK
console.info('一键发货');
that.express(order_id, action, vendor);
break;
case 'checkLogistics': //查看物流
that.logistics(order_id, action, vendor);
console.info('查看物流');
break;
case 'orderDetails': //订单详情
console.info('订单详情');
that.orderDetails(order_id, order_id);
break;
case 'consentRefund': //同意退款
......@@ -578,7 +568,6 @@ export default {
break;
default:
//其他的 退款啥的 处理ok了
// console.info('1111', action);
break;
}
},
......@@ -612,6 +601,7 @@ export default {
}
})
.then(res => {
console.info(res,"退款到这里了");
if (res.code == 0) {
if (this.status != 'all') {
let order = this.order;
......@@ -702,7 +692,6 @@ export default {
shop_id: ''
};
setReceivingGoods(params).then(res => {
// console.log(res);
if (res.code == 0) {
uni.$emit('isDelorder', { action: 'setReceivingGoods' });
uni.showToast({
......@@ -732,6 +721,7 @@ export default {
success: res => {
if (res.confirm) {
shopExamine(params).then(res => {
console.info("退款请求",res);
if (res.code == 0) {
uni.$emit('isDelorder', { action: 'shopExamine' });
uni.showToast({
......@@ -742,6 +732,8 @@ export default {
this.listDeal2(); //同意退款后自动刷新售后列表
}
});
}else{
this.$api.msg(res.msg);
}
}
});
......
pages/order/shoprefundorderdetail/shoprefundorderdetail.vue
View file @ 72693add
......@@ -29,6 +29,7 @@
<view class="topbox_20 mt-20" v-if="detail.refund_datail != '' || detail.refund_pics.length>0 ">
<view style="font-size: 30upx;font-weight: 500;">售后说明</view>
<view class="mt-20 refund_datail">{{ detail.refund_datail }}</view>
<view class="mt-20 refund_datail" v-if="detail.examine_reason" >回复：{{ detail.examine_reason }}</view>
<view class="datail_img">
<image
:src="staticUrl + item"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment