完善小程序
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
|
||||
<view
|
||||
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
|
||||
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);">
|
||||
|
||||
<view class="top" style="position: fixed;">
|
||||
|
||||
@@ -91,24 +91,24 @@
|
||||
|
||||
<text style="font-size: 13px;color: #000;"
|
||||
@click="itemClick(item.goodsSid)">{{item.name}}</text>
|
||||
<!--
|
||||
<text
|
||||
style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text> -->
|
||||
|
||||
<!-- <text
|
||||
style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remarks}}</text> -->
|
||||
|
||||
<view
|
||||
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
|
||||
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
|
||||
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
font-size: 10px;color: #EE752F; margin-left: 10px; margin-right: 10px; ">{{item.remarks}}</text>
|
||||
font-size: 10px;color: #EE752F;">{{item.title}}</text>
|
||||
<text
|
||||
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
font-size: 10px;color: #EE752F; margin-left: 10px; margin-right: 10px; ">{{item.quantityOfPackage}}{{item.unitName}}/{{item.specificationUnit}}</text>
|
||||
|
||||
</view>
|
||||
|
||||
<!-- sss -->
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
|
||||
<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 5px;
|
||||
margin-right: 15px;">
|
||||
<text style="font-size: 14px;color: #FF5006;">¥{{item.jprice}}元</text>
|
||||
<text
|
||||
style="font-size: 14px;color: #FF5006;">¥{{item.packprice}}元</text>
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;">
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
|
||||
<view style="display: flex;flex-direction: row;align-items: center;margin-left: 20px; ">
|
||||
|
||||
<view style=" display: flex;flex-direction: row;align-items: center; border: 1px #60CA2C solid;margin-left: 5px;margin-right: 5px;padding: 0px 5px;height: 42px;flex: 1;
|
||||
<view style=" display: flex;flex-direction: row;align-items: center; border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 5px;height: 42px;flex: 1;
|
||||
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;">
|
||||
|
||||
<view
|
||||
@@ -199,8 +199,8 @@
|
||||
|
||||
|
||||
<text
|
||||
style="background: #60CA2C; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
|
||||
border: 1px #60CA2C solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;margin-right: 20px;"
|
||||
style="background: #FF9900; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
|
||||
border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;margin-right: 20px;"
|
||||
@click="settlement()">去结算</text>
|
||||
|
||||
</view>
|
||||
@@ -313,7 +313,7 @@
|
||||
|
||||
<view v-for="(item,index) in newPerGiftList" class="device-list" style="overflow-y: auto;">
|
||||
<view style="">
|
||||
<radio :value="item.sid" style="transform:scale(0.8)" color="#60CA2C" />
|
||||
<radio :value="item.sid" style="transform:scale(0.8)" color="#FF9900" />
|
||||
</view>
|
||||
|
||||
<view
|
||||
@@ -354,7 +354,7 @@
|
||||
<view
|
||||
style=" height: 15vw; flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;"
|
||||
class="newpor_bom">
|
||||
<text style="background: #60CA2C;color: #fff;text-align: center;border-radius: 20px;
|
||||
<text style="background: #FF9900;color: #fff;text-align: center;border-radius: 20px;
|
||||
padding:8px 25px ;" @click="newporGift">确认结算</text>
|
||||
</view>
|
||||
|
||||
@@ -552,7 +552,8 @@
|
||||
sid: "0",
|
||||
name: "",
|
||||
affiliation: "",
|
||||
customerSid: ""
|
||||
customerSid: "",
|
||||
orgPath: getApp().globalData.orgPath
|
||||
},
|
||||
styleObject: {
|
||||
// 'position': 'fixed',
|
||||
@@ -762,7 +763,9 @@
|
||||
this.getgoods()
|
||||
} else {
|
||||
let _this = this
|
||||
_this.$api.getGoodsTypeAndBrand().then((resp) => {
|
||||
_this.$api.getGoodsTypeAndBrand({
|
||||
orgPath: getApp().globalData.orgPath
|
||||
}).then((resp) => {
|
||||
_this.data = resp
|
||||
console.log("======", resp);
|
||||
_this.baseDataSuccess = true
|
||||
@@ -806,55 +809,54 @@
|
||||
getgoods() {
|
||||
let _this = this
|
||||
|
||||
var params = {
|
||||
customerSid: getApp().globalData.sid,
|
||||
brandId: this.data.brandVos[this.selectIndex2].id
|
||||
}
|
||||
_this.$api.isEnterprise(params).then((resp) => {
|
||||
console.log("isEnterprise>>", resp);
|
||||
// 正常继续操作 不是企业菜窖类型或已经认证成功
|
||||
_this.searchInfo.customerSid = getApp().globalData.sid
|
||||
_this.searchInfo.brandId = _this.data.brandVos[_this.selectIndex2].id
|
||||
_this.searchInfo.categoryId = _this.data.typeVos[_this.selectIndex].id
|
||||
// var params = {
|
||||
// customerSid: getApp().globalData.sid,
|
||||
// brandId: this.data.brandVos[this.selectIndex2].id
|
||||
// }
|
||||
// _this.$api.isEnterprise(params).then((resp) => {
|
||||
// console.log("isEnterprise>>", resp);
|
||||
// 正常继续操作 不是企业菜窖类型或已经认证成功
|
||||
_this.searchInfo.customerSid = getApp().globalData.sid
|
||||
_this.searchInfo.brandId = _this.data.brandVos[_this.selectIndex2].id
|
||||
_this.searchInfo.categoryId = _this.data.typeVos[_this.selectIndex].id
|
||||
|
||||
_this.$api.getGoodsByType(_this.searchInfo).then((resp) => {
|
||||
_this.goods = resp
|
||||
_this.notData = resp.length == 0
|
||||
_this.notAuthentication = false
|
||||
_this.getAllPriceOrWeight()
|
||||
}).catch(e => {
|
||||
_this.$nextTick(() => {
|
||||
_this.$refs.pageView.setLoadState(1)
|
||||
})
|
||||
})
|
||||
|
||||
}).catch(e => {
|
||||
console.log("isEnterprise>>", e);
|
||||
_this.$api.getGoodsByType(_this.searchInfo).then((resp) => {
|
||||
_this.goods = resp
|
||||
_this.notData = resp.length == 0
|
||||
_this.notAuthentication = false
|
||||
_this.getAllPriceOrWeight()
|
||||
_this.goods = []
|
||||
// 错误需判断code 状态
|
||||
this.authenticationType = e.code
|
||||
if (e.code == '201') {
|
||||
// 未认证
|
||||
this.notAuthentication = true
|
||||
|
||||
} else if (e.code == '202' || e.code == '203') {
|
||||
// 认证审核中 或 认证不通过
|
||||
this.notAuthentication = false
|
||||
this.showModal6 = true
|
||||
this.authenticationRemarks = e.data.remarks
|
||||
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: e.msg,
|
||||
icon: 'none',
|
||||
duration: 5000,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
}).catch(e => {
|
||||
_this.$nextTick(() => {
|
||||
_this.$refs.pageView.setLoadState(1)
|
||||
})
|
||||
})
|
||||
|
||||
// }).catch(e => {
|
||||
// console.log("isEnterprise>>", e);
|
||||
// _this.getAllPriceOrWeight()
|
||||
// _this.goods = []
|
||||
// // 错误需判断code 状态
|
||||
// this.authenticationType = e.code
|
||||
// if (e.code == '201') {
|
||||
// // 未认证
|
||||
// this.notAuthentication = true
|
||||
|
||||
// } else if (e.code == '202' || e.code == '203') {
|
||||
// // 认证审核中 或 认证不通过
|
||||
// this.notAuthentication = false
|
||||
// this.showModal6 = true
|
||||
// this.authenticationRemarks = e.data.remarks
|
||||
|
||||
// } else {
|
||||
// uni.showToast({
|
||||
// title: e.msg,
|
||||
// icon: 'none',
|
||||
// duration: 5000,
|
||||
// })
|
||||
// }
|
||||
|
||||
|
||||
// })
|
||||
|
||||
|
||||
},
|
||||
@@ -885,7 +887,7 @@
|
||||
// } else {
|
||||
if (Number(item.goodsNumber) > 0) {
|
||||
item.goodsNumber = Number(item.goodsNumber) - 1
|
||||
item.subtotal = Number(item.goodsNumber) * Number(item.jprice)
|
||||
item.subtotal = Number(item.goodsNumber) * Number(item.packprice)
|
||||
|
||||
that.upDateShoppCart(item)
|
||||
}
|
||||
@@ -896,7 +898,7 @@
|
||||
jia(item) {
|
||||
|
||||
item.goodsNumber = Number(item.goodsNumber) + 1
|
||||
item.subtotal = Number(item.goodsNumber) * Number(item.jprice)
|
||||
item.subtotal = Number(item.goodsNumber) * Number(item.packprice)
|
||||
|
||||
this.upDateShoppCart(item)
|
||||
},
|
||||
@@ -958,8 +960,8 @@
|
||||
goodsName: item.name,
|
||||
goodsNumber: item.goodsNumber,
|
||||
affiliation: this.data.brandVos[this.selectIndex2].id,
|
||||
price: item.jprice,
|
||||
weight: item.weight,
|
||||
price: item.packprice,
|
||||
weight: item.goodsNumber,
|
||||
customerSid: getApp().globalData.sid
|
||||
}
|
||||
|
||||
@@ -1198,7 +1200,7 @@
|
||||
|
||||
.button2 {
|
||||
background: #fff;
|
||||
color: #60CA2C;
|
||||
color: #FF9900;
|
||||
border-radius: 0px;
|
||||
border-bottom-right-radius: 20px;
|
||||
flex: 1;
|
||||
@@ -1206,7 +1208,7 @@
|
||||
}
|
||||
|
||||
button {
|
||||
background: #60CA2C;
|
||||
background: #FF9900;
|
||||
color: #fff;
|
||||
height: 42px;
|
||||
line-height: 40px;
|
||||
@@ -1335,7 +1337,7 @@
|
||||
.swiper /deep/ .wx-swiper-dot-active {
|
||||
width: 44rpx;
|
||||
height: 12rpx;
|
||||
background: #60CA2C;
|
||||
background: #FF9900;
|
||||
border-radius: 8rpx;
|
||||
}
|
||||
|
||||
@@ -1374,7 +1376,7 @@
|
||||
.label2 {
|
||||
background: #FFF;
|
||||
color: #FFF;
|
||||
background-color: #60CA2C;
|
||||
background-color: #FF9900;
|
||||
font-size: 12px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
@@ -1388,7 +1390,7 @@
|
||||
}
|
||||
|
||||
.top_img1 {
|
||||
border: 1px #60CA2C solid;
|
||||
border: 1px #FF9900 solid;
|
||||
}
|
||||
|
||||
.top_img2 {
|
||||
@@ -1396,8 +1398,8 @@
|
||||
}
|
||||
|
||||
.top_text1 {
|
||||
border: 1px #60CA2C solid;
|
||||
background: #81C95D;
|
||||
border: 1px #FF9900 solid;
|
||||
background: #FF5006;
|
||||
color: #fff;
|
||||
font-weight: 800;
|
||||
font-family: sans-serif;
|
||||
@@ -1410,9 +1412,9 @@
|
||||
}
|
||||
|
||||
.top_text2 {
|
||||
border: 1px #60CA2C solid;
|
||||
border: 1px #FF9900 solid;
|
||||
background: #fff;
|
||||
color: #81C95D;
|
||||
color: #F6894B;
|
||||
font-weight: 800;
|
||||
padding: 5px 12px;
|
||||
font-family: sans-serif;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
|
||||
<view
|
||||
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#61CB29,#60CA2C);">
|
||||
style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);">
|
||||
|
||||
<view class="top">
|
||||
<NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight"
|
||||
@@ -84,8 +84,12 @@
|
||||
<view
|
||||
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
|
||||
<!-- :class="item.state=='0'?'oragin':'gray'" -->
|
||||
<text :class="item.state=='0'?'oragin':'gray'" style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
|
||||
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
font-size: 10px;color: #EE752F;">{{item.weight}}</text>
|
||||
<text
|
||||
style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;margin-left: 10px;
|
||||
font-size: 10px;color: #EE752F;">{{item.quantityOfPackage}}{{item.unitName}}/{{item.specificationUnit}}</text>
|
||||
|
||||
|
||||
<text
|
||||
style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
|
||||
@@ -147,7 +151,7 @@
|
||||
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
|
||||
<text style="font-size: 14px; color: #666;margin-right: 5px;">您的订单为空,请</text>
|
||||
<text
|
||||
style="background: #61CB29; border-radius: 8px; padding: 3px 8px; color: #fff;"
|
||||
style="background: #FF9900; border-radius: 8px; padding: 3px 8px; color: #fff;"
|
||||
@click="gotoShopp()">补充商品</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -165,11 +169,11 @@
|
||||
style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;padding: 0px 20px;">
|
||||
|
||||
<text
|
||||
style="background: #61CB29;color: #fff;height: 40px;line-height: 40px;font-size: 13px;padding: 0px 15px;border: 1px #61CB29 solid;
|
||||
style="background: #FF9900;color: #fff;height: 40px;line-height: 40px;font-size: 13px;padding: 0px 15px;border: 1px #FF5006 solid;
|
||||
border-top-left-radius: 25px;border-bottom-left-radius: 25px;border-top-right-radius: 0px;border-bottom-right-radius: 0px;"
|
||||
@click="transfer()">转赠亲友</text>
|
||||
|
||||
<view style="border: 1px #61CB29 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
|
||||
<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
|
||||
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;"
|
||||
@click="gotoCart()">
|
||||
<!-- image src="../../static/shoppCart_icon.png" mode="aspectFill"
|
||||
@@ -178,8 +182,8 @@
|
||||
<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">{{page.count}}</text>
|
||||
<text style="font-size: 12px;color: #666;margin-left: 10px; ">份</text>
|
||||
</view>
|
||||
<text style="background: #61CB29; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
|
||||
border: 1px #61CB29 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;"
|
||||
<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
|
||||
border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;"
|
||||
@click="reservation()">预约提货</text>
|
||||
|
||||
|
||||
@@ -224,7 +228,7 @@
|
||||
<view
|
||||
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
|
||||
<text style="border: 1px #EE752F solid; border-radius: 5px; padding: 0px 8px;
|
||||
font-size: 10px;color: #EE752F;">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
|
||||
font-size: 10px;color: #EE752F;">{{item.weight}}</text>
|
||||
|
||||
<text
|
||||
style="border: 1px #EE752F solid; background: #FF9900;margin-left: 10px; color: #fff; font-size: 10px;border-radius: 5px; padding: 0px 8px;"
|
||||
@@ -271,7 +275,7 @@
|
||||
style="width: 50vw;height: 50vw;"></image>
|
||||
<view style="display: flex;flex-direction: row;align-items: center;margin-top: -15px;">
|
||||
<text
|
||||
style="background: #61CB29; border-radius: 8px; padding: 3px 8px; color: #fff;">请添加~</text>
|
||||
style="background: #FF9900; border-radius: 8px; padding: 3px 8px; color: #fff;">请添加~</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -628,7 +632,8 @@
|
||||
request() {
|
||||
let _this = this
|
||||
var params = {
|
||||
customerSid: getApp().globalData.sid
|
||||
customerSid: getApp().globalData.sid,
|
||||
orgPath: getApp().globalData.orgPath
|
||||
}
|
||||
|
||||
_this.$api.vegeCellarTypeList(params).then((resp) => {
|
||||
@@ -648,7 +653,8 @@
|
||||
|
||||
var params = {
|
||||
customerSid: getApp().globalData.sid,
|
||||
affiliation: this.data[this.selectIndex].id
|
||||
affiliation: this.data[this.selectIndex].id,
|
||||
orgPath: getApp().globalData.orgPath
|
||||
}
|
||||
|
||||
|
||||
@@ -952,7 +958,7 @@
|
||||
|
||||
.button2 {
|
||||
background: #fff;
|
||||
color: #61CB29;
|
||||
color: #FF9900;
|
||||
border-radius: 0px;
|
||||
border-bottom-right-radius: 20px;
|
||||
flex: 1;
|
||||
@@ -960,13 +966,13 @@
|
||||
}
|
||||
|
||||
button {
|
||||
background: #61CB29;
|
||||
background: #FF9900;
|
||||
color: #fff;
|
||||
height: 42px;
|
||||
line-height: 40px;
|
||||
font-size: 13px;
|
||||
padding: 0px 15px;
|
||||
border: 1px #61CB29 solid;
|
||||
border: 1px #FF5006 solid;
|
||||
border-top-left-radius: 25px;
|
||||
border-bottom-left-radius: 25px;
|
||||
border-top-right-radius: 0px;
|
||||
@@ -1023,7 +1029,7 @@
|
||||
.label2 {
|
||||
background: #FFF;
|
||||
color: #FFF;
|
||||
background-color: #61CB29;
|
||||
background-color: #FF9900;
|
||||
font-size: 12px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
@@ -1036,7 +1042,7 @@
|
||||
}
|
||||
|
||||
.top_img1 {
|
||||
border: 1px #61CB29 solid;
|
||||
border: 1px #FF9900 solid;
|
||||
}
|
||||
|
||||
.top_img2 {
|
||||
@@ -1044,8 +1050,8 @@
|
||||
}
|
||||
|
||||
.top_text1 {
|
||||
border: 1px #61CB29 solid;
|
||||
background: #61CB29;
|
||||
border: 1px #FF9900 solid;
|
||||
background: #FF5006;
|
||||
color: #fff;
|
||||
font-weight: 800;
|
||||
font-family: sans-serif;
|
||||
@@ -1058,9 +1064,9 @@
|
||||
}
|
||||
|
||||
.top_text2 {
|
||||
border: 1px #61CB29 solid;
|
||||
border: 1px #FF9900 solid;
|
||||
background: #fff;
|
||||
color: #61CB29;
|
||||
color: #F6894B;
|
||||
font-weight: 800;
|
||||
padding: 5px 16px;
|
||||
font-family: sans-serif;
|
||||
|
||||
Reference in New Issue
Block a user