先货后款,流程,样式,交互,修改
This commit is contained in:
THK3121
parent
b4c6386686
commit
fbbaf79080
@ -73,7 +73,7 @@
|
|||||||
<view class="right-btn-box">
|
<view class="right-btn-box">
|
||||||
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
|
<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
|
||||||
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
|
<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
|
||||||
<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && orderData.refund_status || item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
|
<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && evaluate !==2 && orderData.refund_status" @click.stop="refund(item)">申请退款</view>
|
||||||
<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
|
<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
|
||||||
<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
|
<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
"name" : "惠农生活",
|
"name" : "惠农生活",
|
||||||
"appid" : "__UNI__3A527D1",
|
"appid" : "__UNI__3A527D1",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.17",
|
"versionName" : "1.0.18",
|
||||||
"versionCode" : 140,
|
"versionCode" : 141,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
|||||||
19
pages.json
19
pages.json
@ -227,11 +227,9 @@
|
|||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}, {
|
||||||
,{
|
|
||||||
"path": "teach_video/teach_video",
|
"path": "teach_video/teach_video",
|
||||||
"style" :
|
"style": {
|
||||||
{
|
|
||||||
"navigationBarTitleText": "教学视频",
|
"navigationBarTitleText": "教学视频",
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false,
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
@ -679,11 +677,16 @@
|
|||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}, {
|
||||||
,{
|
|
||||||
"path": "payment/payment",
|
"path": "payment/payment",
|
||||||
"style" :
|
"style": {
|
||||||
{
|
"navigationBarTitleText": "",
|
||||||
|
"enablePullDownRefresh": false
|
||||||
|
}
|
||||||
|
|
||||||
|
}, {
|
||||||
|
"path": "trading_hall/index",
|
||||||
|
"style": {
|
||||||
"navigationBarTitleText": "",
|
"navigationBarTitleText": "",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
|
|||||||
@ -148,6 +148,12 @@
|
|||||||
<view style="height:120upx;"></view>
|
<view style="height:120upx;"></view>
|
||||||
<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'">
|
<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'">
|
||||||
<view class="more"></view>
|
<view class="more"></view>
|
||||||
|
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(item.group_order_id,1)">
|
||||||
|
同意
|
||||||
|
</view>
|
||||||
|
<view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12" @click="tongyi(item.group_order_id,2)">
|
||||||
|
拒绝
|
||||||
|
</view>
|
||||||
<view class="bnt cancel" @click="modify('0')" v-if="orderInfo.paid == 0">
|
<view class="bnt cancel" @click="modify('0')" v-if="orderInfo.paid == 0">
|
||||||
一键改价
|
一键改价
|
||||||
</view>
|
</view>
|
||||||
@ -249,6 +255,27 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
//同意先货后款订单
|
||||||
|
tongyi(id,number){
|
||||||
|
let data={
|
||||||
|
id:id,
|
||||||
|
type:number
|
||||||
|
}
|
||||||
|
if(number == 1){
|
||||||
|
this.$nextTick(()=>{
|
||||||
|
this.where.status = 2;
|
||||||
|
delete this.where.is_verify;
|
||||||
|
this.init();
|
||||||
|
})
|
||||||
|
}else if(number == 2){
|
||||||
|
uni.navigateTo({
|
||||||
|
url:`/pages/admin/orderList/index?types=1&merId=${this.merId}`
|
||||||
|
})
|
||||||
|
}
|
||||||
|
postconfirm(this.merId,data).then(res=>{
|
||||||
|
console.log(res);
|
||||||
|
})
|
||||||
|
},
|
||||||
more: function() {
|
more: function() {
|
||||||
this.order = !this.order;
|
this.order = !this.order;
|
||||||
},
|
},
|
||||||
|
|||||||
@ -130,15 +130,22 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="public-total">
|
<view class="public-total" v-if="item.pay_type !== 8">
|
||||||
共{{ item.total_num }}件商品，
|
共{{ item.total_num }}件商品，
|
||||||
<span v-if="where.status <= 1">应</span>
|
<span v-if="where.status <= 1">应</span>
|
||||||
<span v-else>已</span>
|
<span v-else>已</span>
|
||||||
支付
|
支付
|
||||||
<span class="money">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
|
<span class="money">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
|
||||||
</view>
|
</view>
|
||||||
<view class="public-total" v-if="item.pay_type == 8 && item.status == 12">
|
<view class="public-total" v-else >
|
||||||
共1件商品，结算周期到期后付款￥100
|
先货后款
|
||||||
|
<span v-if="where.status <= 1">应</span>
|
||||||
|
<span v-else>已</span>
|
||||||
|
支付
|
||||||
|
<span class="money">￥{{ item.pay_price }}</span> (邮费 ¥{{ item.pay_postage}})
|
||||||
|
</view>
|
||||||
|
<view class="public-total" v-if="item.pay_type == 8 ">
|
||||||
|
共1件商品，结算周期到期后付款￥{{ item.pay_price }}
|
||||||
</view>
|
</view>
|
||||||
<view class="operation acea-row row-between-wrapper">
|
<view class="operation acea-row row-between-wrapper">
|
||||||
<view class="more">
|
<view class="more">
|
||||||
|
|||||||
@ -117,6 +117,21 @@
|
|||||||
</image>
|
</image>
|
||||||
<text class="text">商户设置</text>
|
<text class="text">商户设置</text>
|
||||||
</view>
|
</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>
|
||||||
|
<text class="text">交易大厅</text>
|
||||||
|
</view>
|
||||||
|
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
|
||||||
|
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
|
||||||
|
</image>
|
||||||
|
<text class="text">委托销售</text>
|
||||||
|
</view>
|
||||||
|
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
|
||||||
|
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
|
||||||
|
</image>
|
||||||
|
<text class="text">发布管理</text>
|
||||||
|
</view>
|
||||||
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
|
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
|
||||||
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
|
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
|
||||||
</image>
|
</image>
|
||||||
|
|||||||
@ -1349,9 +1349,10 @@
|
|||||||
postCartAdd(q)
|
postCartAdd(q)
|
||||||
.then(function(res) {
|
.then(function(res) {
|
||||||
that.isOpen = that.attr.cartAttr = false;
|
that.isOpen = that.attr.cartAttr = false;
|
||||||
|
console.log(that.storeInfo);
|
||||||
if (news) {
|
if (news) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id}`
|
url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id}&type_id=${that.storeInfo.merchant.type_id}`
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
that.$util.Tips({
|
that.$util.Tips({
|
||||||
|
|||||||
@ -108,6 +108,8 @@
|
|||||||
this.getGoods()
|
this.getGoods()
|
||||||
this.selfLocation()
|
this.selfLocation()
|
||||||
this.Area()
|
this.Area()
|
||||||
|
this.setPermissions()
|
||||||
|
// this.openTongZhi()
|
||||||
uni.$on('connectstatusChange',(connectstatus) =>{
|
uni.$on('connectstatusChange',(connectstatus) =>{
|
||||||
var connectstr = ''
|
var connectstr = ''
|
||||||
if (connectstatus == true) {
|
if (connectstatus == true) {
|
||||||
@ -261,6 +263,85 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置手机通知权限
|
||||||
|
*/
|
||||||
|
setPermissions() {
|
||||||
|
// #ifdef APP-PLUS
|
||||||
|
if (plus.os.name == 'Android') { // 判断是Android
|
||||||
|
var main = plus.android.runtimeMainActivity();
|
||||||
|
var pkName = main.getPackageName();
|
||||||
|
var uid = main.getApplicationInfo().plusGetAttribute("uid");
|
||||||
|
var NotificationManagerCompat = plus.android.importClass("android.support.v4.app.NotificationManagerCompat");
|
||||||
|
//android.support.v4升级为androidx
|
||||||
|
if (NotificationManagerCompat == null) {
|
||||||
|
NotificationManagerCompat = plus.android.importClass("androidx.core.app.NotificationManagerCompat");
|
||||||
|
}
|
||||||
|
var areNotificationsEnabled = NotificationManagerCompat.from(main).areNotificationsEnabled();
|
||||||
|
// 未开通‘允许通知’权限，则弹窗提醒开通，并点击确认后，跳转到系统设置页面进行设置
|
||||||
|
if (!areNotificationsEnabled) {
|
||||||
|
uni.showModal({
|
||||||
|
title: '通知权限开启提醒',
|
||||||
|
content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
|
||||||
|
showCancel: false,
|
||||||
|
confirmText: '去设置',
|
||||||
|
success: function(res) {
|
||||||
|
if (res.confirm) {
|
||||||
|
var Intent = plus.android.importClass('android.content.Intent');
|
||||||
|
var Build = plus.android.importClass("android.os.Build");
|
||||||
|
//android 8.0引导
|
||||||
|
if (Build.VERSION.SDK_INT >= 26) {
|
||||||
|
var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
|
||||||
|
intent.putExtra('android.provider.extra.APP_PACKAGE', pkName);
|
||||||
|
} else if (Build.VERSION.SDK_INT >= 21) { //android 5.0-7.0
|
||||||
|
var intent = new Intent('android.settings.APP_NOTIFICATION_SETTINGS');
|
||||||
|
intent.putExtra("app_package", pkName);
|
||||||
|
intent.putExtra("app_uid", uid);
|
||||||
|
} else { //(<21)其他--跳转到该应用管理的详情页
|
||||||
|
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
|
||||||
|
var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
|
||||||
|
intent.setData(uri);
|
||||||
|
}
|
||||||
|
// 跳转到该应用的系统通知设置页
|
||||||
|
main.startActivity(intent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (plus.os.name == 'iOS') { // 判断是ISO
|
||||||
|
var isOn = undefined;
|
||||||
|
var types = 0;
|
||||||
|
var app = plus.ios.invoke('UIApplication', 'sharedApplication');
|
||||||
|
var settings = plus.ios.invoke(app, 'currentUserNotificationSettings');
|
||||||
|
if (settings) {
|
||||||
|
types = settings.plusGetAttribute('types');
|
||||||
|
plus.ios.deleteObject(settings);
|
||||||
|
} else {
|
||||||
|
types = plus.ios.invoke(app, 'enabledRemoteNotificationTypes');
|
||||||
|
}
|
||||||
|
plus.ios.deleteObject(app);
|
||||||
|
isOn = (0 != types);
|
||||||
|
if (isOn == false) {
|
||||||
|
uni.showModal({
|
||||||
|
title: '通知权限开启提醒',
|
||||||
|
content: '您还没有开启通知权限，无法接受到消息通知，请前往设置！',
|
||||||
|
showCancel: false,
|
||||||
|
confirmText: '去设置',
|
||||||
|
success: function(res) {
|
||||||
|
if (res.confirm) {
|
||||||
|
var app = plus.ios.invoke('UIApplication', 'sharedApplication');
|
||||||
|
var setting = plus.ios.invoke('NSURL', 'URLWithString:', 'app-settings:');
|
||||||
|
plus.ios.invoke(app, 'openURL:', setting);
|
||||||
|
plus.ios.deleteObject(setting);
|
||||||
|
plus.ios.deleteObject(app);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// #endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -41,6 +41,35 @@
|
|||||||
<navigator class="bottom_purchase" url="./shopping_trolley" open-type="navigate">采购清单</navigator>
|
<navigator class="bottom_purchase" url="./shopping_trolley" open-type="navigate">采购清单</navigator>
|
||||||
|
|
||||||
<goodsPopup :goodsStatu="isPopupShow" @colses="isPopupShow=false" :goods_info="goodsInfo"></goodsPopup>
|
<goodsPopup :goodsStatu="isPopupShow" @colses="isPopupShow=false" :goods_info="goodsInfo"></goodsPopup>
|
||||||
|
<u-popup :show="show" @close="close">
|
||||||
|
<view>
|
||||||
|
<h3 style=" margin: 15px 5px 5px 24px;">颜色规格</h3>
|
||||||
|
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y">
|
||||||
|
<view class="scroll-view-item" v-for="(item,index) in attrValue" :key="index">
|
||||||
|
<view class="scroll_item_top">
|
||||||
|
<image :src="Image" mode=""></image>
|
||||||
|
<view class="text">
|
||||||
|
<view>{{item.sku}}</view>
|
||||||
|
<view>库存: <text>{{item.stock}}</text> </view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="scroll_item_bon">
|
||||||
|
<view class="reduce" @click.stop='subCart(item,index)'>-</view>
|
||||||
|
<input type="text" v-model="goods[index].cart_num" />
|
||||||
|
<view class="plus" :class="goods.numAdd ? 'on' : ''" @click.stop='addCart(item,index)'>+</view>
|
||||||
|
<!-- <u-number-box
|
||||||
|
button-size="36"
|
||||||
|
color="#ffffff"
|
||||||
|
bgColor="#2979ff"
|
||||||
|
iconStyle="color: #fff"
|
||||||
|
v-model="number.cart_num"
|
||||||
|
></u-number-box> -->
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</scroll-view>
|
||||||
|
<button class="btn" @click="addshopcart">确定</button>
|
||||||
|
</view>
|
||||||
|
</u-popup>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -52,6 +81,9 @@
|
|||||||
} from '@/api/store.js'
|
} from '@/api/store.js'
|
||||||
import { Toast } from '@/libs/uniApi'
|
import { Toast } from '@/libs/uniApi'
|
||||||
import goodsPopup from '../cpns/goodsPopup.vue'
|
import goodsPopup from '../cpns/goodsPopup.vue'
|
||||||
|
import {
|
||||||
|
changeCartNum
|
||||||
|
} from '@/api/order.js';
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
goodsPopup
|
goodsPopup
|
||||||
@ -88,7 +120,16 @@
|
|||||||
},
|
},
|
||||||
id: '',
|
id: '',
|
||||||
order: true,
|
order: true,
|
||||||
num: ''
|
num: '',
|
||||||
|
show: false,
|
||||||
|
scrollTop: 0,
|
||||||
|
attrValue: [],
|
||||||
|
Image: '',
|
||||||
|
goods: [{
|
||||||
|
cart_num: 0
|
||||||
|
}],
|
||||||
|
goodsLite: {},
|
||||||
|
goodsindexL: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(e) {
|
onLoad(e) {
|
||||||
@ -176,23 +217,27 @@
|
|||||||
* 获取产品详情
|
* 获取产品详情
|
||||||
*/
|
*/
|
||||||
getGoodsDetails(item) {
|
getGoodsDetails(item) {
|
||||||
// console.log('e,item',e,item);
|
console.log(item);
|
||||||
// let that = this;
|
if (item.product.attrValue.length == 1) {
|
||||||
// const count = e.value
|
|
||||||
// getProductDetail(item.product_id).then(res => {
|
|
||||||
// const unique = Object.values(res.data.sku)[0].unique
|
|
||||||
// console.log(res.data.product_id, count, unique,'123123');
|
|
||||||
// that.goCat(res.data.product_id, count, unique)
|
|
||||||
// })
|
|
||||||
let that = this;
|
let that = this;
|
||||||
const count = '1'
|
const count = '1'
|
||||||
// console.log(111);
|
|
||||||
getProductDetail(item.product_id, { product_type: 98 }).then(res => {
|
getProductDetail(item.product_id, { product_type: 98 }).then(res => {
|
||||||
const unique = Object.values(res.data.sku)[0].unique
|
const unique = Object.values(res.data.sku)[0].unique
|
||||||
that.goCat(res.data.product_id, count, unique)
|
that.goCat(res.data.product_id, count, unique)
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
Toast(err)
|
Toast(err)
|
||||||
})
|
})
|
||||||
|
} else {
|
||||||
|
this.show = true
|
||||||
|
this.attrValue = item.product.attrValue
|
||||||
|
this.Image = item.image
|
||||||
|
for (let i = 1; i < item.product.attrValue.length; i++) {
|
||||||
|
this.goods.push({
|
||||||
|
cart_num: 0
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
/*
|
/*
|
||||||
* 加入购物车
|
* 加入购物车
|
||||||
@ -220,7 +265,52 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
close() {
|
||||||
|
this.show = false
|
||||||
|
},
|
||||||
|
//购物车增加
|
||||||
|
addCart(item, index) {
|
||||||
|
this.goods[index].cart_num = this.goods[index].cart_num + 1
|
||||||
|
this.goods.numAdd = true
|
||||||
|
this.goodsLite = item
|
||||||
|
this.goodsindexL = index
|
||||||
|
},
|
||||||
|
subCart(item, index){
|
||||||
|
if( this.goods[index].cart_num == 0){
|
||||||
|
return
|
||||||
|
}else{
|
||||||
|
this.goods[index].cart_num = this.goods[index].cart_num - 1
|
||||||
|
this.goods.numAdd = true
|
||||||
|
this.goodsLite = item
|
||||||
|
this.goodsindexL = index
|
||||||
|
}
|
||||||
|
},
|
||||||
|
addshopcart() {
|
||||||
|
console.log(this.goodsLite);
|
||||||
|
console.log(this.goodsindexL);
|
||||||
|
let that = this
|
||||||
|
let q = {
|
||||||
|
is_new: 0,
|
||||||
|
product_id: that.goodsLite.product_id,
|
||||||
|
cart_num: that.goods[that.goodsindexL].cart_num,
|
||||||
|
product_attr_unique: that.goodsLite.unique,
|
||||||
|
// source: this.source,
|
||||||
|
product_type: 98,
|
||||||
|
spread_id: ''
|
||||||
|
};
|
||||||
|
postCartAdd(q).then(res => {
|
||||||
|
this.show = false
|
||||||
|
that.$util.Tips({
|
||||||
|
title: "添加购物车成功",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(res => {
|
||||||
|
this.show = false
|
||||||
|
return that.$util.Tips({
|
||||||
|
title: res
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onReachBottom() {
|
onReachBottom() {
|
||||||
//如果状态为nomore 则不能在触发上拉事件
|
//如果状态为nomore 则不能在触发上拉事件
|
||||||
@ -395,4 +485,86 @@
|
|||||||
background-color: $uni-theme-color;
|
background-color: $uni-theme-color;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.scroll-Y {
|
||||||
|
height: 50vh;
|
||||||
|
width: 90%;
|
||||||
|
margin: auto;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.scroll-view-item {
|
||||||
|
font-size: 36rpx;
|
||||||
|
border-bottom: 1px solid #ccc;
|
||||||
|
|
||||||
|
.scroll_item_top {
|
||||||
|
height: 60px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
image {
|
||||||
|
width: 50px;
|
||||||
|
height: 50px;
|
||||||
|
margin: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text {
|
||||||
|
width: 300px;
|
||||||
|
height: 60px;
|
||||||
|
float: left;
|
||||||
|
|
||||||
|
view {
|
||||||
|
height: 30px;
|
||||||
|
|
||||||
|
text {
|
||||||
|
color: #F84221;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.scroll_item_bon {
|
||||||
|
width: 100%;
|
||||||
|
height: 40px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
.reduce {
|
||||||
|
width: 30px;
|
||||||
|
height: 30px;
|
||||||
|
text-align: center;
|
||||||
|
color: #BDC4CE;
|
||||||
|
background: #EEEEEE;
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
width: 50px;
|
||||||
|
height: 30px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.plus {
|
||||||
|
width: 30px;
|
||||||
|
text-align: center;
|
||||||
|
height: 30px;
|
||||||
|
color: #FFFFFF;
|
||||||
|
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
|
||||||
|
}
|
||||||
|
.on {
|
||||||
|
background-color: #e3e3e3;
|
||||||
|
color: #dedede;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.btn{
|
||||||
|
width: 100%;
|
||||||
|
height: 50px;
|
||||||
|
background: linear-gradient(84deg, #F98649 0%, #F34E45 100%);
|
||||||
|
border-radius: 24px 24px 24px 24px;
|
||||||
|
line-height: 50px;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@ -242,6 +242,7 @@
|
|||||||
currSku: '',
|
currSku: '',
|
||||||
newData: {},
|
newData: {},
|
||||||
activeRouter: '',
|
activeRouter: '',
|
||||||
|
type_id:''
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: configMap({ hide_mer_status: 1, recommend_switch: 0, navigation: {} }, mapGetters(['isLogin',
|
computed: configMap({ hide_mer_status: 1, recommend_switch: 0, navigation: {} }, mapGetters(['isLogin',
|
||||||
@ -568,7 +569,7 @@
|
|||||||
})
|
})
|
||||||
if (selectValue.length > 0) {
|
if (selectValue.length > 0) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}`
|
url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=${this.type_id}`
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
return this.$util.Tips({
|
return this.$util.Tips({
|
||||||
@ -578,6 +579,7 @@
|
|||||||
},
|
},
|
||||||
// 购物车增加
|
// 购物车增加
|
||||||
addCart: function(goods, index) {
|
addCart: function(goods, index) {
|
||||||
|
console.log(goods.cart_id);
|
||||||
let that = this;
|
let that = this;
|
||||||
changeCartNum(goods.cart_id, {
|
changeCartNum(goods.cart_id, {
|
||||||
cart_num: goods.cart_num + 1
|
cart_num: goods.cart_num + 1
|
||||||
@ -671,6 +673,7 @@
|
|||||||
let that = this;
|
let that = this;
|
||||||
getCartList({ product_type: 98 }).then(res => {
|
getCartList({ product_type: 98 }).then(res => {
|
||||||
// console.log("购物车", res)
|
// console.log("购物车", res)
|
||||||
|
this.type_id=res.data.list[0].type_id
|
||||||
res.data.list.forEach((item, index) => {
|
res.data.list.forEach((item, index) => {
|
||||||
item.allCheck = true
|
item.allCheck = true
|
||||||
item.list.forEach((goods, j) => {
|
item.list.forEach((goods, j) => {
|
||||||
|
|||||||
@ -302,8 +302,8 @@
|
|||||||
<view class='bnt b-color' @tap='confirmOrder'>确认收货</view>
|
<view class='bnt b-color' @tap='confirmOrder'>确认收货</view>
|
||||||
</block>
|
</block>
|
||||||
<block v-if="orderInfo.status == 2">
|
<block v-if="orderInfo.status == 2">
|
||||||
<view class="bnt cancel" @click="allRefund"
|
<!-- <view class="bnt cancel" @click="allRefund"
|
||||||
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
|
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> -->
|
||||||
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
|
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
|
||||||
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
||||||
</navigator>
|
</navigator>
|
||||||
@ -351,6 +351,18 @@
|
|||||||
<button class="shouhuobtn" @click="close">知道了</button>
|
<button class="shouhuobtn" @click="close">知道了</button>
|
||||||
</view>
|
</view>
|
||||||
</u-popup>
|
</u-popup>
|
||||||
|
<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
|
||||||
|
<view class="warp">
|
||||||
|
<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
|
||||||
|
<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
|
||||||
|
</view>
|
||||||
|
<view class="textp">
|
||||||
|
<h3>确认收到货了吗?</h3>
|
||||||
|
<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
|
||||||
|
<button class="shouhuobtn" @click="queding()">确认收货</button>
|
||||||
|
<view class="cle" @click="close">取消</view>
|
||||||
|
</view>
|
||||||
|
</u-popup>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
@ -474,6 +486,7 @@
|
|||||||
add: false,
|
add: false,
|
||||||
},
|
},
|
||||||
show: false,
|
show: false,
|
||||||
|
receivingshow:false
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -887,28 +900,27 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
//收货弹窗
|
||||||
confirmOrder: function() {
|
confirmOrder: function() {
|
||||||
|
this.receivingshow=true
|
||||||
|
|
||||||
|
},
|
||||||
|
queding(){
|
||||||
let that = this;
|
let that = this;
|
||||||
uni.showModal({
|
|
||||||
title: '确认收货',
|
|
||||||
content: '为保障权益，请收到货确认无误后，再确认收货',
|
|
||||||
success: function(res) {
|
|
||||||
if (res.confirm) {
|
|
||||||
orderTake(that.order_id).then(res => {
|
orderTake(that.order_id).then(res => {
|
||||||
|
this.receivingshow=false
|
||||||
return that.$util.Tips({
|
return that.$util.Tips({
|
||||||
title: '操作成功',
|
title: '成功收货',
|
||||||
icon: 'success'
|
icon: 'success'
|
||||||
}, function() {
|
}, function() {
|
||||||
that.getOrderInfo();
|
that.getOrderInfo();
|
||||||
});
|
});
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
this.receivingshow=false
|
||||||
return that.$util.Tips({
|
return that.$util.Tips({
|
||||||
title: err
|
title: err
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -984,6 +996,7 @@
|
|||||||
},
|
},
|
||||||
close(){
|
close(){
|
||||||
this.show=false
|
this.show=false
|
||||||
|
this.receivingshow=false
|
||||||
},
|
},
|
||||||
open(){
|
open(){
|
||||||
this.show=true
|
this.show=true
|
||||||
@ -1594,6 +1607,9 @@
|
|||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
h3 {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
.shouhuobtn {
|
.shouhuobtn {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
|
|||||||
@ -7,9 +7,14 @@
|
|||||||
<view class='pictrue'>
|
<view class='pictrue'>
|
||||||
<image :src="imgUrl+'/static/order_1.gif'"></image>
|
<image :src="imgUrl+'/static/order_1.gif'"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class='data'>
|
<view class='data' v-if="!this.be_overday">
|
||||||
<view class='state'>请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付!</view>
|
<view class='state'>请在{{this.be_overdue}}天{{this.be_overhours}}时前完成支付!</view>
|
||||||
|
|
||||||
|
<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
|
||||||
|
</view>
|
||||||
|
<view class='data' v-else>
|
||||||
|
<view class='state'>已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快前往完成支付!</view>
|
||||||
|
|
||||||
<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
|
<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -301,6 +306,8 @@
|
|||||||
product_type: 0,
|
product_type: 0,
|
||||||
be_overdue: '', //逾期时间
|
be_overdue: '', //逾期时间
|
||||||
be_overhours: '', //逾期小时
|
be_overhours: '', //逾期小时
|
||||||
|
be_overday:false,
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@ -541,8 +548,11 @@
|
|||||||
if (this.be_overdue == 0 || this.be_overdue < 0) {
|
if (this.be_overdue == 0 || this.be_overdue < 0) {
|
||||||
var date1 = (Date.parse(new Date())) / 1000;
|
var date1 = (Date.parse(new Date())) / 1000;
|
||||||
var date2 = (Date.parse(new Date(autoTime))) / 1000;
|
var date2 = (Date.parse(new Date(autoTime))) / 1000;
|
||||||
var date3 = (date2 - date1) * 1000;
|
var date3 = (date1 - date2) * 1000;
|
||||||
this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000));
|
this.be_overdue = Math.floor(date3 / (24 * 3600 * 1000));
|
||||||
|
var leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
|
||||||
|
this.be_overhours = Math.floor(leave1 / (3600 * 1000));
|
||||||
|
this.be_overday = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1144,7 +1154,11 @@
|
|||||||
.warp {
|
.warp {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 30vh;
|
top: 30vh;
|
||||||
left: 30px;
|
left: 60px;
|
||||||
|
width: 70%;
|
||||||
|
image{
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.guanbi {
|
.guanbi {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@ -1157,25 +1171,25 @@
|
|||||||
|
|
||||||
.textp {
|
.textp {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 44vh;
|
top: 40vh;
|
||||||
left: 35px;
|
left: 90px;
|
||||||
width: 320px;
|
width: 210px;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
|
|
||||||
span {
|
span {
|
||||||
display: block;
|
display: block;
|
||||||
width: 290px;
|
width: 210px;
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shouhuobtn {
|
.shouhuobtn {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
line-height: 54px;
|
line-height: 34px;
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
width: 191px;
|
width: 150px;
|
||||||
height: 54px;
|
height: 34px;
|
||||||
color: white;
|
color: white;
|
||||||
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
|
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
|
||||||
border-radius: 27px 27px 27px 27px;
|
border-radius: 27px 27px 27px 27px;
|
||||||
|
|||||||
@ -39,11 +39,6 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view v-if="item.more_thanFlag">
|
<view v-if="item.more_thanFlag">
|
||||||
<view class="multiSpecifica_container_item">
|
|
||||||
<view class="multiSpecifica_container_item_label flex-start">库存</view>
|
|
||||||
<view class="multiSpecifica_container_item_value"><input v-model="item.stock" type="number" placeholder="请填写商品库存" /></view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="multiSpecifica_container_item">
|
<view class="multiSpecifica_container_item">
|
||||||
<view class="multiSpecifica_container_item_label flex-start">商品编号</view>
|
<view class="multiSpecifica_container_item_label flex-start">商品编号</view>
|
||||||
<view class="multiSpecifica_container_item_value"><input v-model="item.bar_code" type="text" placeholder="请填写商品编号" /></view>
|
<view class="multiSpecifica_container_item_value"><input v-model="item.bar_code" type="text" placeholder="请填写商品编号" /></view>
|
||||||
@ -112,12 +107,6 @@
|
|||||||
<view class="changePopup_container_content_item_label">原价</view>
|
<view class="changePopup_container_content_item_label">原价</view>
|
||||||
<view class="changePopup_container_content_item_value"><input v-model="batchData.ot_price" type="number" placeholder="0.00" /></view>
|
<view class="changePopup_container_content_item_value"><input v-model="batchData.ot_price" type="number" placeholder="0.00" /></view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="changePopup_container_content_item">
|
|
||||||
<view class="changePopup_container_content_item_label">库存</view>
|
|
||||||
<view class="changePopup_container_content_item_value"><input v-model="batchData.stock" type="number" placeholder="0.00" /></view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="popup_moreThan" @click="popupOpenModel = !popupOpenModel" v-if="!popupOpenModel">
|
<view class="popup_moreThan" @click="popupOpenModel = !popupOpenModel" v-if="!popupOpenModel">
|
||||||
<text>展开</text>
|
<text>展开</text>
|
||||||
<text class="iconfont"></text>
|
<text class="iconfont"></text>
|
||||||
@ -182,7 +171,6 @@ export default {
|
|||||||
price: '', //售价
|
price: '', //售价
|
||||||
cost: '', // 成本价
|
cost: '', // 成本价
|
||||||
ot_price: '', // 原价
|
ot_price: '', // 原价
|
||||||
stock: '', // 库存
|
|
||||||
bar_code: '', // 商品编号
|
bar_code: '', // 商品编号
|
||||||
weight: '', // 重量
|
weight: '', // 重量
|
||||||
volume: '', // 体积
|
volume: '', // 体积
|
||||||
@ -363,7 +351,6 @@ export default {
|
|||||||
price: 0,
|
price: 0,
|
||||||
cost: 0,
|
cost: 0,
|
||||||
ot_price: 0,
|
ot_price: 0,
|
||||||
stock: 0,
|
|
||||||
bar_code: '',
|
bar_code: '',
|
||||||
weight: 0,
|
weight: 0,
|
||||||
volume: 0,
|
volume: 0,
|
||||||
@ -397,7 +384,6 @@ export default {
|
|||||||
price: 0,
|
price: 0,
|
||||||
cost: 0,
|
cost: 0,
|
||||||
ot_price: 0,
|
ot_price: 0,
|
||||||
stock: 0,
|
|
||||||
bar_code: '',
|
bar_code: '',
|
||||||
weight: 0,
|
weight: 0,
|
||||||
volume: 0,
|
volume: 0,
|
||||||
|
|||||||
@ -26,7 +26,6 @@
|
|||||||
price: '', // 售价
|
price: '', // 售价
|
||||||
cost: '', // 成本价
|
cost: '', // 成本价
|
||||||
ot_price: '', // 原价
|
ot_price: '', // 原价
|
||||||
stock: '', // 库存
|
|
||||||
bar_code: '', // 商品编号
|
bar_code: '', // 商品编号
|
||||||
weight: '', // 重量
|
weight: '', // 重量
|
||||||
volume: '', // 体积
|
volume: '', // 体积
|
||||||
@ -56,13 +55,6 @@
|
|||||||
type: 'digit',
|
type: 'digit',
|
||||||
holder: '请填写原价',
|
holder: '请填写原价',
|
||||||
model: 'ot_price'
|
model: 'ot_price'
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 4,
|
|
||||||
label: '库存',
|
|
||||||
type: 'number',
|
|
||||||
holder: '请填写库存',
|
|
||||||
model: 'stock'
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
moreThanList: [
|
moreThanList: [
|
||||||
|
|||||||
@ -52,7 +52,8 @@
|
|||||||
<image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
|
<image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
|
||||||
<text class="text">规格模板</text>
|
<text class="text">规格模板</text>
|
||||||
</navigator>
|
</navigator>
|
||||||
<navigator class="item" :url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
|
<navigator class="item"
|
||||||
|
: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>
|
||||||
@ -102,8 +103,6 @@
|
|||||||
<view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架
|
<view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架
|
||||||
</view>
|
</view>
|
||||||
<view @click="editGoods(item)" class="bnt">编辑</view>
|
<view @click="editGoods(item)" class="bnt">编辑</view>
|
||||||
<navigator :url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'"
|
|
||||||
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" @tap.stop="handleRecommend(item)">
|
<view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">
|
||||||
@ -130,8 +129,8 @@
|
|||||||
</u-radio-group>
|
</u-radio-group>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="shuru">
|
<view class="shuru" v-if="this.on_line == 1">
|
||||||
数量: <input type="text" v-model="data.number" placeholder="请输入">
|
数量: <input type="number" v-model="data.number" placeholder="请输入" >
|
||||||
</view>
|
</view>
|
||||||
<view class="btn">
|
<view class="btn">
|
||||||
<button class="btn_l" @click="close()">取消</button>
|
<button class="btn_l" @click="close()">取消</button>
|
||||||
@ -196,6 +195,10 @@
|
|||||||
{
|
{
|
||||||
value: '1',
|
value: '1',
|
||||||
text: '线下入库'
|
text: '线下入库'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: '2',
|
||||||
|
text: '预览'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
//线下
|
//线下
|
||||||
@ -233,10 +236,9 @@
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.on_line = action
|
this.on_line = action
|
||||||
console.log(this.on_line);
|
|
||||||
this.checkboxList1 = rowId
|
this.checkboxList1 = rowId
|
||||||
|
console.log(this.on_line);
|
||||||
if(!this.checkboxList1[0].sku && action == 0){
|
if (this.checkboxList1.length == 1 && action == 0) {
|
||||||
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,
|
||||||
@ -246,6 +248,11 @@
|
|||||||
this.show = true
|
this.show = true
|
||||||
console.log(this.data);
|
console.log(this.data);
|
||||||
}
|
}
|
||||||
|
if (action == 2) {
|
||||||
|
uni.navigateTo({
|
||||||
|
url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0`
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
close() {
|
close() {
|
||||||
@ -703,6 +710,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.acea-row.row-between-wrapper {
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.genduo {
|
.genduo {
|
||||||
@ -737,10 +748,12 @@
|
|||||||
.guige {
|
.guige {
|
||||||
margin: 10px 0 10px 20px;
|
margin: 10px 0 10px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.guiges {
|
.guiges {
|
||||||
height: 100px;
|
height: 100px;
|
||||||
margin: 10px 0 10px 20px;
|
margin: 10px 0 10px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shuru {
|
.shuru {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
|||||||
@ -80,39 +80,7 @@
|
|||||||
class="font_pro">《隐私政策》</text></text>
|
class="font_pro">《隐私政策》</text></text>
|
||||||
</checkbox-group>
|
</checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
<!-- #ifdef MP -->
|
|
||||||
<!-- <view class="appLogin">
|
|
||||||
<view class="hds">
|
|
||||||
<span class="line"></span>
|
|
||||||
<p>其他方式登录</p>
|
|
||||||
<span class="line"></span>
|
|
||||||
</view>
|
|
||||||
<view class="btn-wrapper">
|
|
||||||
<button form-type="submit" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
|
||||||
<view class="btn wx">
|
|
||||||
<span class="iconfont icon-s-weixindenglu1"></span>
|
|
||||||
</view>
|
|
||||||
</button>
|
|
||||||
</view>
|
|
||||||
</view> -->
|
|
||||||
<!-- #endif -->
|
|
||||||
<!-- #ifdef APP-PLUS -->
|
|
||||||
<!-- <view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
|
|
||||||
<view class="hds">
|
|
||||||
<span class="line"></span>
|
|
||||||
<p>其他方式登录</p>
|
|
||||||
<span class="line"></span>
|
|
||||||
</view>
|
|
||||||
<view class="btn-wrapper">
|
|
||||||
<view class="btn wx" @click="wxLogin">
|
|
||||||
<span class="iconfont icon-s-weixindenglu1"></span>
|
|
||||||
</view>
|
|
||||||
<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
|
|
||||||
<span class="iconfont icon-s-pingguo"></span>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view> -->
|
|
||||||
<!-- #endif -->
|
|
||||||
</div>
|
</div>
|
||||||
<div class="whiteBg" v-else>
|
<div class="whiteBg" v-else>
|
||||||
<div class="title">注册账号</div>
|
<div class="title">注册账号</div>
|
||||||
@ -168,24 +136,6 @@
|
|||||||
class="font_pro">《隐私政策》</text></text>
|
class="font_pro">《隐私政策》</text></text>
|
||||||
</checkbox-group>
|
</checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- #ifdef APP-PLUS -->
|
|
||||||
<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
|
|
||||||
<view class="hds">
|
|
||||||
<span class="line"></span>
|
|
||||||
<p>其他方式登录</p>
|
|
||||||
<span class="line"></span>
|
|
||||||
</view>
|
|
||||||
<view class="btn-wrapper">
|
|
||||||
<view class="btn wx" @click="wxLogin">
|
|
||||||
<span class="iconfont icon-s-weixindenglu1"></span>
|
|
||||||
</view>
|
|
||||||
<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
|
|
||||||
<span class="iconfont icon-s-pingguo"></span>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<!-- #endif -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="bottom"></div>
|
<div class="bottom"></div>
|
||||||
|
|||||||
@ -68,7 +68,7 @@
|
|||||||
点击确定，商品管理
|
点击确定，商品管理
|
||||||
</view>
|
</view>
|
||||||
<view class="btn">
|
<view class="btn">
|
||||||
<button class="btn_l" @click="close()">取消</button>
|
<button class="btn_l" @click="closeasd()">取消</button>
|
||||||
<button class="btn_r" @click="getback()">确定</button>
|
<button class="btn_r" @click="getback()">确定</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -117,7 +117,7 @@
|
|||||||
onLoad(option) {
|
onLoad(option) {
|
||||||
console.log(option);
|
console.log(option);
|
||||||
this.mer_id = option.mer_id
|
this.mer_id = option.mer_id
|
||||||
this.getList(this.mer_id);
|
this.getList();
|
||||||
this.data.product_id = option.product_id
|
this.data.product_id = option.product_id
|
||||||
this.data.unique = option.unique
|
this.data.unique = option.unique
|
||||||
},
|
},
|
||||||
@ -128,7 +128,7 @@
|
|||||||
this.shopList = [];
|
this.shopList = [];
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
getList: function(mer_id) {
|
getList: function() {
|
||||||
if (this.loading || this.loaded) return;
|
if (this.loading || this.loaded) return;
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
getOrderList(this.where, this.mer_id).then(res => {
|
getOrderList(this.where, this.mer_id).then(res => {
|
||||||
@ -152,6 +152,15 @@
|
|||||||
},
|
},
|
||||||
close() {
|
close() {
|
||||||
this.show = false
|
this.show = false
|
||||||
|
|
||||||
|
},
|
||||||
|
closeasd:function(){
|
||||||
|
this.show = false
|
||||||
|
getOrderList(this.where, this.mer_id).then(res => {
|
||||||
|
console.log(res);
|
||||||
|
this.shopList = res.data.list
|
||||||
|
console.log(this.shopList);
|
||||||
|
})
|
||||||
},
|
},
|
||||||
getback() {
|
getback() {
|
||||||
uni.navigateBack({
|
uni.navigateBack({
|
||||||
@ -220,7 +229,7 @@
|
|||||||
|
|
||||||
.list {
|
.list {
|
||||||
width: 690rpx;
|
width: 690rpx;
|
||||||
margin: 14rpx auto 0 auto;
|
margin: 50px auto 0 auto;
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
height: 84rpx;
|
height: 84rpx;
|
||||||
|
|||||||
@ -645,6 +645,7 @@
|
|||||||
product_type: '',
|
product_type: '',
|
||||||
interest_rate: '', //利率
|
interest_rate: '', //利率
|
||||||
settle_cycle: '', // 周期
|
settle_cycle: '', // 周期
|
||||||
|
type_id:'',//店铺类型
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -662,6 +663,7 @@
|
|||||||
onReady() {},
|
onReady() {},
|
||||||
mounted: function() {},
|
mounted: function() {},
|
||||||
onLoad: function(options) {
|
onLoad: function(options) {
|
||||||
|
this.type_id=options.type_id
|
||||||
this.product_type = options.product_type
|
this.product_type = options.product_type
|
||||||
this.seckillId = options.seckillId
|
this.seckillId = options.seckillId
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
@ -1068,8 +1070,8 @@
|
|||||||
that.order_key = res.data.key
|
that.order_key = res.data.key
|
||||||
that.cartArr[4].title =
|
that.cartArr[4].title =
|
||||||
`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
|
`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
|
||||||
console.log(that.settle_cycle);
|
console.log(res.data.order[0]);
|
||||||
if (res.data.order[0].credit_buy == 1) {
|
if (res.data.order[0].credit_buy == 1 && this.type_id ==12){
|
||||||
this.cartArr[4].payStatus = 1
|
this.cartArr[4].payStatus = 1
|
||||||
} else {
|
} else {
|
||||||
this.cartArr[4].payStatus = 0
|
this.cartArr[4].payStatus = 0
|
||||||
|
|||||||
@ -67,7 +67,7 @@
|
|||||||
{{item.group_order_sn}}
|
{{item.group_order_sn}}
|
||||||
</view>
|
</view>
|
||||||
<view class='t-color'>
|
<view class='t-color'>
|
||||||
{{item.pay_type == 3 ? "待付款" : "待结算" }}
|
{{item.pay_type == 3 ? "待付款" : "去结算" }}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
|
<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
|
||||||
@ -99,6 +99,14 @@
|
|||||||
</view>
|
</view>
|
||||||
<view>x{{goods.product_num}}</view>
|
<view>x{{goods.product_num}}</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
|
||||||
|
<view>
|
||||||
|
先货后款 实付:￥0.00
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="totalPrice" v-if="item.pay_type == 8">
|
||||||
|
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
|
<view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
|
||||||
定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
|
定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
|
||||||
@ -120,30 +128,39 @@
|
|||||||
<view class='name line2'>{{goods.cart_info.product.store_name}}
|
<view class='name line2'>{{goods.cart_info.product.store_name}}
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class='money' v-if="item.orderList[0].activity_type == 4">
|
<view class='money' v-if="item.pay_type == 8">
|
||||||
<view v-if="goods.cart_info.activeSku">
|
<view v-if="goods.cart_info.activeSku">
|
||||||
￥{{goods.cart_info.activeSku.active_price}}</view>
|
￥{{goods.cart_info.activeSku.active_price}}</view>
|
||||||
<view>x{{goods.product_num}}</view>
|
<view>x{{goods.product_num}}</view>
|
||||||
|
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
|
||||||
|
<view>
|
||||||
|
先货后款 实付:￥0.00
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="totalPrice" v-if="item.pay_type == 8">
|
||||||
|
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-else class='money'>
|
<view v-else class='money'>
|
||||||
<view>￥{{goods.cart_info.productAttr.price}}</view>
|
<view>￥{{goods.cart_info.productAttr.price}}</view>
|
||||||
<view>x{{goods.product_num}}</view>
|
<view>x{{goods.product_num}}</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
|
<view class='totalPrice' v-if="item.pay_type !== 8">
|
||||||
共{{item.total_num || 0}}件商品，总金额
|
共{{item.total_num || 0}}件商品，总金额
|
||||||
<text class='money p-color'>￥{{item.pay_price}}</text>
|
<text class='money p-color'>￥{{item.pay_price}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
|
<!-- <view class='totalPrice' v-else>先货后款 实付款:
|
||||||
<text class='money p-color'>￥{{item.pay_price}}</text>
|
<text class='money p-color'>￥0.00</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="totalPrice" v-if="item.pay_type == 8">
|
<view class="totalPrice" v-if="item.pay_type == 8">
|
||||||
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
|
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
|
||||||
</view>
|
</view> -->
|
||||||
<view class='bottom acea-row row-right row-middle' v-if=" item.pay_type == 3 ">
|
<view class='bottom acea-row row-right row-middle' v-if=" item.pay_type == 3 ">
|
||||||
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
|
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
|
||||||
立即付款</view>
|
立即付款</view>
|
||||||
@ -204,6 +221,14 @@
|
|||||||
<view class='money'>
|
<view class='money'>
|
||||||
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
|
<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
|
||||||
<view>x{{goods.product_num}}</view>
|
<view>x{{goods.product_num}}</view>
|
||||||
|
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 0">
|
||||||
|
<view>
|
||||||
|
先货后款 实付:￥0.00
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="totalPrice" v-if="item.pay_type == 8">
|
||||||
|
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -229,11 +254,27 @@
|
|||||||
<view v-if="goods.cart_info.productAssistAttr">
|
<view v-if="goods.cart_info.productAssistAttr">
|
||||||
￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
|
￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
|
||||||
<view>x{{goods.product_num}}</view>
|
<view>x{{goods.product_num}}</view>
|
||||||
|
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
|
||||||
|
<view>
|
||||||
|
先货后款 实付:￥0.00
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="totalPrice" v-if="item.pay_type == 8">
|
||||||
|
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class='money' v-else-if="item.activity_type == 4">
|
<view class='money' v-else-if="item.activity_type == 4">
|
||||||
<view v-if="goods.cart_info.activeSku">
|
<view v-if="goods.cart_info.activeSku">
|
||||||
￥{{goods.cart_info.activeSku.active_price}}</view>
|
￥{{goods.cart_info.activeSku.active_price}}</view>
|
||||||
<view>x{{goods.product_num}}</view>
|
<view>x{{goods.product_num}}</view>
|
||||||
|
<view class="money" style="margin-left: 117px;" v-if="item.pay_type == 8">
|
||||||
|
<view>
|
||||||
|
先货后款 实付:￥0.00
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="totalPrice" v-if="item.pay_type == 8">
|
||||||
|
共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{goods.cart_info.productAttr.price || item.interest.total_amount}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class='money' v-else>
|
<view class='money' v-else>
|
||||||
<view>￥{{goods.cart_info.productAttr.price}}</view>
|
<view>￥{{goods.cart_info.productAttr.price}}</view>
|
||||||
@ -1149,7 +1190,8 @@
|
|||||||
|
|
||||||
.warp {
|
.warp {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
|
image{
|
||||||
|
}
|
||||||
.guanbi {
|
.guanbi {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
|
|||||||
@ -44,14 +44,14 @@
|
|||||||
<view class="settel">
|
<view class="settel">
|
||||||
<view class='settel-t'>
|
<view class='settel-t'>
|
||||||
<view>总价：</view>
|
<view>总价：</view>
|
||||||
<view class='conter'>￥ {{couponData.orderList[0].pay_price}}</view>
|
<view class='conter'>￥ {{couponData.interest.total_price}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="settel" v-if="this.be_overdue == 0 || this.be_overdue < 0">
|
<view class="settel" v-if="this.be_overdue == 0 || this.be_overdue < 0">
|
||||||
<view class='settel-t'>
|
<view class='settel-t'>
|
||||||
<view>利息合计:</view>
|
<view>利息合计:</view>
|
||||||
<view class="conter">
|
<view class="conter">
|
||||||
<view class='con_text'>￥ {{couponData.orderList[0].pay_price}}</view>
|
<view class='con_text'>￥ {{couponData.interest.interest}}</view>
|
||||||
<view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">
|
<view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">
|
||||||
已逾期{{this.be_overday}}天</view>
|
已逾期{{this.be_overday}}天</view>
|
||||||
</view>
|
</view>
|
||||||
@ -63,11 +63,11 @@
|
|||||||
<view>
|
<view>
|
||||||
合计:
|
合计:
|
||||||
<text class='pColor' v-if="cartArr[4].payStatus == 1">￥0.00</text>
|
<text class='pColor' v-if="cartArr[4].payStatus == 1">￥0.00</text>
|
||||||
<text class='pColor' v-else>￥{{couponData.orderList[0].pay_price}}</text>
|
<text class='pColor' v-else>￥{{couponData.interest.total_amount}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0 ">
|
<!-- <view style="font-size: 14px;color: #F84221;" v-if="this.be_overdue == 0 || this.be_overdue < 0 ">
|
||||||
可结算周期到期后再付款￥{{totalPrice}}
|
可结算周期到期后再付款￥{{totalPrice}}
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
<view class='settlement' @tap="SubOrder">
|
<view class='settlement' @tap="SubOrder">
|
||||||
提交订单
|
提交订单
|
||||||
@ -232,7 +232,7 @@
|
|||||||
if(this.be_overdue == 0 || this.be_overdue < 0 ){
|
if(this.be_overdue == 0 || this.be_overdue < 0 ){
|
||||||
var date1 = (Date.parse(new Date()))/1000;
|
var date1 = (Date.parse(new Date()))/1000;
|
||||||
var date2 = (Date.parse(new Date(autoTime)))/1000;
|
var date2 = (Date.parse(new Date(autoTime)))/1000;
|
||||||
var date3 = (date2- date1)*1000;
|
var date3 = (date1- date2)*1000;
|
||||||
this.be_overday =Math.floor(date3 / (24 * 3600 * 1000));
|
this.be_overday =Math.floor(date3 / (24 * 3600 * 1000));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -428,9 +428,9 @@
|
|||||||
.con_text {
|
.con_text {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
height: 35px;
|
height: 20px;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
line-height: 35px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
115
pages/users/trading_hall/index.vue
Normal file
115
pages/users/trading_hall/index.vue
Normal file
@ -0,0 +1,115 @@
|
|||||||
|
<template>
|
||||||
|
<view>
|
||||||
|
<view class="header">
|
||||||
|
<view class="top-header">
|
||||||
|
<view class="search">
|
||||||
|
<view class="search-content acea-row row-middle">
|
||||||
|
<text class="iconfont icon-sousuo"></text>
|
||||||
|
<input v-model="where.keyword" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input"
|
||||||
|
@confirm="handleSearch" />
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="recom">
|
||||||
|
<rudon-rowMenuDotDotDot :localdata="options" @change="menuAction($event, 1)">
|
||||||
|
推荐
|
||||||
|
</rudon-rowMenuDotDotDot>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="list">
|
||||||
|
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { methods } from '../../../uni_modules/uview-ui/libs/mixin/mixin'
|
||||||
|
export default {
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
where: {
|
||||||
|
page: 1,
|
||||||
|
limit: 10,
|
||||||
|
status: 20,
|
||||||
|
product_type: 98,
|
||||||
|
keyword: '',
|
||||||
|
},
|
||||||
|
options: [{
|
||||||
|
value: '0',
|
||||||
|
text: '推荐'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: '1',
|
||||||
|
text: '调货'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: '2',
|
||||||
|
text: '打折专区'
|
||||||
|
}
|
||||||
|
],
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
menuAction(action, rowId) {
|
||||||
|
// 忽略初始化时的传入的空操作
|
||||||
|
if (action === '') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.header {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
.top-header {
|
||||||
|
// position: fixed;
|
||||||
|
// top: 0;
|
||||||
|
// left: 0;
|
||||||
|
z-index: 9999;
|
||||||
|
width: 80%;
|
||||||
|
background-color: #fff;
|
||||||
|
|
||||||
|
.search {
|
||||||
|
padding: 17rpx 30rpx;
|
||||||
|
|
||||||
|
.search-content {
|
||||||
|
width: 100%;
|
||||||
|
height: 60rpx;
|
||||||
|
padding: 0 30rpx;
|
||||||
|
border-radius: 30rpx;
|
||||||
|
background-color: #F5F5F5;
|
||||||
|
font-size: 26rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.iconfont {
|
||||||
|
margin-right: 10rpx;
|
||||||
|
font-size: 26rpx;
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-placeholder {
|
||||||
|
font-size: 26rpx;
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.recom {
|
||||||
|
width: 78px;
|
||||||
|
height: 34px;
|
||||||
|
text-align: center;
|
||||||
|
border-radius: 30px;
|
||||||
|
border: 1px solid #F84221;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
BIN
static/images/diaohuo.png
Normal file
BIN
static/images/diaohuo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
static/images/fabu.png
Normal file
BIN
static/images/fabu.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
BIN
static/images/weituo.png
Normal file
BIN
static/images/weituo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Loading…
x
Reference in New Issue
Block a user