Skip to content

肖康 / H5_2.0

Go to a project
Commit 40f3e398 by LJM
Options

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

parents 2f867b20 7be471b2
Inline Side-by-side
Showing with 498 additions and 151 deletions
assets/css/confirm/confirm.scss
......@@ -125,18 +125,10 @@
border-radius: 32rpx;
border:1rpx solid #c2c4cc;
}
.icon-xzs{
color:$uni-coloract;
display: none;
}
&.act{
.icon-xzs{
display: flex;
}
.noxz{
display: none;
}
.icon-jt{
color:$uni-color999;
}
}
.ztperson{
.nppinfo{
......@@ -170,6 +162,62 @@
}
.fpbox{
padding:24rpx;
background: #fff;
margin-top: 16rpx;
.icon-fpp{
font-size: 40rpx;
color:$uni-coloract;
margin-right: 16rpx;
&.nofp{color:$uni-color999;}
}
.itemcen{
color:$uni-color999;
font-size: 24rpx;
width:600rpx;
}
.icon-jt{
color:$uni-color999;
}
.iteminfo{
width:600rpx;
.infot{
font-size: 28rpx;
font-weight: 600;
color:$uni-color333;
text{
width: 76rpx;
height: 34rpx;
background: #FFFFFF;
border-radius: 17rpx;
border: 1rpx solid #C6C7CC;
color:$uni-color999;
font-size: 22rpx;
text-align: center;
margin-left: 16rpx;
font-weight: normal;
}
}
.infopeo{
font-size: 24rpx;
font-weight: 400;
color:$uni-color666;
margin-top: 8rpx;
text{margin-right: 24rpx;}
}
.infob{
margin-top: 8rpx;
font-size: 24rpx;
font-weight: 400;
color:$uni-color999;
line-height: 33rpx;
}
}
}
.htbox{
margin-top: 16rpx;
height: 178rpx;
......@@ -192,6 +240,8 @@
margin-top: 20rpx;
}
}
.goodsbox{
margin-top: 16rpx;
padding:24rpx;
......
package-lock.json
{
"name": "h5_2.0",
"version": "1.0.0",
"lockfileVersion": 1,
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "h5_2.0",
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"jweixin-module": "^1.6.0",
"lodash": "^4.17.21",
"query-string": "^6.14.1",
"uni-simple-router": "^1.5.5"
}
},
"node_modules/jweixin-module": {
"version": "1.6.0",
"resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
},
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://repo.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"node_modules/query-string": {
"version": "6.14.1",
"resolved": "https://registry.npmmirror.com/query-string/-/query-string-6.14.1.tgz",
"integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
"dependencies": {
"decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/query-string/node_modules/decode-uri-component": {
"version": "0.2.2",
"resolved": "https://repo.huaweicloud.com/repository/npm/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"engines": {
"node": ">=0.10"
}
},
"node_modules/query-string/node_modules/filter-obj": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/filter-obj/-/filter-obj-1.1.0.tgz",
"integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/query-string/node_modules/split-on-first": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
"engines": {
"node": ">=6"
}
},
"node_modules/query-string/node_modules/strict-uri-encode": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
"engines": {
"node": ">=4"
}
},
"node_modules/uni-simple-router": {
"version": "1.5.5",
"resolved": "https://registry.npmmirror.com/uni-simple-router/-/uni-simple-router-1.5.5.tgz",
"integrity": "sha512-VjBnwhvmWYHVNsj2zcPjYBwb9TqG7miR87qLBBLI4gHOnJVYmCyjZK/bj06f9slvTMbWXrze7LJ9/Hi/8DB0ag==",
"hasInstallScript": true,
"dependencies": {
"query-string": "^6.12.1"
}
},
"node_modules/uni-simple-router/node_modules/decode-uri-component": {
"version": "0.2.2",
"resolved": "https://repo.huaweicloud.com/repository/npm/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"engines": {
"node": ">=0.10"
}
},
"node_modules/uni-simple-router/node_modules/filter-obj": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/filter-obj/-/filter-obj-1.1.0.tgz",
"integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/uni-simple-router/node_modules/query-string": {
"version": "6.14.1",
"resolved": "https://repo.huaweicloud.com/repository/npm/query-string/-/query-string-6.14.1.tgz",
"integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
"dependencies": {
"decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/uni-simple-router/node_modules/split-on-first": {
"version": "1.1.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
"engines": {
"node": ">=6"
}
},
"node_modules/uni-simple-router/node_modules/strict-uri-encode": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
"engines": {
"node": ">=4"
}
}
},
"dependencies": {
"jweixin-module": {
"version": "1.6.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/jweixin-module/-/jweixin-module-1.6.0.tgz",
"resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
"integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
},
"lodash": {
......
pages/confirm/confirm.vue
......@@ -9,156 +9,138 @@
<view class="itemt row rowCenter verCenter" @click.stop="shippingtypetab(2)" :class="{'act':shipping_type==2}">客户自提</view>
</view>
<view class="kdbox" v-show="shipping_type==1">
<navigator url="" class="kditem row verCenter bothSide" >
<navigator v-show="ktaddress.address_id" url="/user/reciveaddress?from=/order/confirm" class="kditem row verCenter bothSide" >
<text class="icon iconfont icon-dzz"></text>
<view class="iteminfo">
<view class="infot row">
<text>拾贰</text>
<text>13800138000</text>
<text>{{ktaddress.consignee}}</text>
<text>{{ktaddress.mobile}}</text>
</view>
<view class="infob">广东省深圳市龙岗区坂田清丽路1号宝能科技</view>
<view class="infob">{{ktaddress.province_val}} {{ktaddress.city_val}} {{ktaddress.district_val}} {{ktaddress.detail_address}}</view>
</view>
<text class="icon iconfont icon-jt"></text>
</navigator>
<navigator url="" class="kdnoitem row verCenter rowCenter " style="display:none;">
<navigator v-show="!ktaddress.address_id" url="/user/userAddressAdd?from=/order/confirm" class="kdnoitem row verCenter rowCenter " >
<text class="icon iconfont icon-dzz"></text>
<text>添加收货地址</text>
</navigator>
</view>
<view class="ztbox" v-show="shipping_type==2">
<view class="zttips row"><text class="icon iconfont icon-dzz"></text> <text>请在接到猎芯网系统短信通知后，再携带已盖章的合同打印件上门取货。</text></view>
<view class="ztitem row verCenter bothSide act">
<view class="ztitem row verCenter bothSide ">
<view class="ztl">
<view class="row ">
<text class="icon iconfont icon-dzz"></text> <text>广东省深圳市龙岗区坂田清丽路1号宝能科技</text>
<text class="icon iconfont icon-dzz"></text> <text>{{ztaddress.address}}</text>
</view>
<view class="row ">
<text class="icon iconfont icon-dh"></text> <text>0755-82560951-8001</text>
<text class="icon iconfont icon-dh"></text> <text>{{ztaddress.phone}}</text>
</view>
<view class="row ">
<text class="icon iconfont icon-gzr"></text> <text>工作日（周一 ~ 周五）9:00 ~ 18:00</text>
<text class="icon iconfont icon-gzr"></text> <text>{{ztaddress.worktime}}</text>
</view>
</view>
<text class="noxz"></text>
<text class="icon iconfont icon-xzs"></text>
</view>
<view class="ztitem row verCenter bothSide">
<view class="ztl">
<view class="row ">
<text class="icon iconfont icon-dzz"></text> <text>香港地址1号宝能科技</text>
</view>
<view class="row ">
<text class="icon iconfont icon-dh"></text> <text>0755-82560951-8001</text>
</view>
<view class="row ">
<text class="icon iconfont icon-gzr"></text> <text>工作日（周一 ~ 周五）9:00 ~ 18:00</text>
</view>
</view>
<text class="noxz"></text>
<text class="icon iconfont icon-xzs"></text>
<text class="icon iconfont icon-jt"></text>
</view>
<view class="ztperson">
<view class="nppinfo row rowCenter verCenter" style="display:none;" @click="openzt()"><text class="icon iconfont icon-tj"></text><text>添加提货人信息</text></view>
<view class="yesztinfo row bothSide verCenter">
<view class="yesztinfo row bothSide verCenter" v-show="obj_.ztname&&obj_.ztphone">
<view class="row">
<text>自提信息：</text>
<view class="zttext">
<text class="textp">蔡先生</text><text class="textp">5645646545</text>
<text class="textp">{{obj_.ztname}}</text><text class="textp">{{obj_.ztphone}}</text>
</view>
</view>
<text class="icon iconfont icon-bjt" @click="openzt()"></text>
</view>
<view v-show="!(obj_.ztname&&obj_.ztphone)" class="nppinfo row rowCenter verCenter" @click="openzt()"><text class="icon iconfont icon-tj"></text><text>添加提货人信息</text></view>
</view>
</view>
<view class="htbox">
<view class="fpbox">
<navigator v-show="fpinfo.tax_id" url="/user/invoice?from=/order/confirm" class="row verCenter bothSide" >
<text class="icon iconfont icon-fpp"></text>
<view class="iteminfo">
<view class="infot row verCenter ">{{fpinfo.tax_title}}<text class="row verCenter rowCenter">{{fpinfo.inv_type==3?'专票':'普票'}}</text></view>
<view class="infopeo row">
<text>{{fpinfo.consignee}}</text>
<text>{{fpinfo.consignee_phone}}</text>
</view>
<view class="infob">{{ fpinfo.consignee_province_val }}{{ fpinfo.consignee_city_val }}{{ fpinfo.consignee_district_val }}{{ fpinfo.consignee_address }}</view>
</view>
<text class="icon iconfont icon-jt"></text>
</navigator>
<navigator v-show="!(fpinfo.tax_id)" url="/user/invoice?from=/order/confirm" class="row verCenter bothSide" >
<text class="icon iconfont icon-fpp nofp"></text>
<view class="itemcen">默认无需发票，若有需要点此设置</view>
<text class="icon iconfont icon-jt"></text>
</navigator>
</view>
<view class="htbox" v-if="currency==2">
<view>合同PI</view>
<input type="text" placeholder="公司名称（必填）" />
<input type="text" placeholder="公司名称（必填）" v-model="pival"/>
</view>
<view class="goodsbox">
<view class="row bothSide titledata">
<view>商品信息</view>
<view class="tir">共<text>2</text>个型号</view>
</view>
<view class="goodsitem">
<view class="t1 row bothSide">
<view class="row">
<view class="goodsname elep">L6207PD013</view>
<view class="actag">95折</view>
</view>
</view>
<view class="t2 row bothSide">
<view class="lbo">
<view class="elep"><text class="label">品牌：</text>Ti</view>
<view class="elep"><text class="label">供应商：</text>mouse</view>
<view class="elep"><text class="label">交期：</text>大陆3-5</view>
</view>
<view class="rbo">
<view class="ipbox row">
<text>￥1.0784</text>
<text class="ch">x</text>
<view class="inputval">100</view>
</view>
<view class="xjbox ">
<text>小计：</text>
<text class="xjmoney">￥1.0784</text>
</view>
</view>
</view>
<view class="tir">共<text>{{obj_.list.length}}</text>个型号</view>
</view>
<view class="goodsitem">
<view class="t1 row bothSide">
<view class="goodsitem" v-for="(item,index) in obj_.list" :key="index">
<view class="t1 row bothSide" >
<view class="row">
<view class="goodsname elep">L6207PD013</view>
<view class="actag">95折</view>
<view class="goodsname elep">{{item.goods_name}}</view>
<view class="actag" v-if="item.ac_type==10">{{item.activity_info.sign}}</view>
</view>
</view>
<view class="t2 row bothSide">
<view class="lbo">
<view class="elep"><text class="label">品牌：</text>Ti</view>
<view class="elep"><text class="label">供应商：</text>mouse</view>
<view class="elep"><text class="label">交期：</text>大陆3-5</view>
<view class="elep"><text class="label">品牌：</text>{{item.brand_name}}</view>
<view class="elep"><text class="label">供应商：</text>{{item.supplier_name}}</view>
<view class="elep"><text class="label">交期：</text>{{currency==1?'大陆':'香港'}}{{item.delivery_time}}</view>
</view>
<view class="rbo">
<view class="ipbox row">
<text>￥1.0784</text>
<text>{{item.goods_price_format}}</text>
<text class="ch">x</text>
<view class="inputval">100</view>
<view class="inputval">{{item.goods_number}}</view>
</view>
<view class="xjbox ">
<text>小计：</text>
<text class="xjmoney">￥1.0784</text>
<text class="xjmoney">{{item.goods_amount_format}}</text>
</view>
</view>
</view>
</view>
<input type="text" class="remark" placeholder="备注信息：请填写有关支付、收货、发票方面"/>
<input type="text" class="remark" v-model="remarks" placeholder="备注信息：请填写有关支付、收货、发票方面"/>
</view>
<view class="priceinfo">
<view class="row rowitem bothSide verCenter fisbox" @click="openyyq()">
<view class="row rowitem bothSide verCenter fisbox" @click="openyyq()" v-if="user_couponNo.length>0||user_coupon.length>0">
<text>优惠券</text>
<text class="pris">￥0.00<text class="icon iconfont icon-jt"></text></text>
<text class="pris">{{obj_.coupon_price_format}}<text class="icon iconfont icon-jt"></text></text>
</view>
<view class="row rowitem bothSide verCenter">
<text>商品金额</text>
<text class="pris">￥0.00</text>
<text class="pris">{{obj_.goods_total_format}}</text>
</view>
<view class="row rowitem bothSide verCenter" v-if="obj_.extend_fee!=0">
<text>附加费<text class="icon iconfont icon-ts" @click="openfjf()"></text></text>
<text class="pris">{{obj_.extend_fee_format}}</text>
</view>
<view class="row rowitem bothSide verCenter">
<text>运费<text class="icon iconfont icon-ts" @click="openyf()"></text></text>
<text class="pris">￥0.00</text>
<text class="pris">{{currency==1?'¥':'$'}}{{obj_.shipping_price}}</text>
</view>
<view class="row rowitem bothSide verCenter fainbox">
<text>应付金额</text>
<text class="prist">￥0.00</text>
<text class="prist">{{obj_.order_amount_format}}</text>
</view>
</view>
<view class="pagebot">—— 已经到底了 ——</view>
<view class="confirmfoot row bothSide verCenter">
<view class="priceis">总金额：<text>¥1176.24</text></view>
<view class="btnh">提交订单</view>
<view class="priceis">总金额：<text>{{obj_.order_amount_format}}</text></view>
<view class="btnh" @click="creatOrder">提交订单</view>
</view>
......@@ -170,97 +152,63 @@
<text class="icon iconfont icon-xxx" @click="closeyyq()"></text>
</view>
<view class="nav row">
<view class="navitem act">可用优惠券<text>(4)</text></view>
<view class="navitem">不可用优惠券<text>(4)</text></view>
<view class="navitem" :class="{'act':coupon}" @click="coupon=!coupon">可用优惠券<text>({{user_coupon.length}})</text></view>
<view class="navitem" :class="{'act':!coupon}" @click="coupon=!coupon">不可用优惠券<text>({{user_couponNo.length}})</text></view>
</view>
<view class="contenty " >
<view class="contenty " v-show="coupon">
<view class="useyhqdata">
<view class="yhcons">
<view class="row item bothSide verCenter act">
<view class="left row ">
<view class="bsri column rowCenter verCenter">
<view class="p1">
<text class="t1">￥</text>
<text class="t2">10</text>
</view>
<view class="p2">满￥200可用</view>
</view>
<view class="textbox">
<view class="elep">新人528元优惠券</view>
<text>2023.02.27-2023.04.0</text>
</view>
</view>
<text class="noxz"></text>
<text class="icon iconfont icon-xzs"></text>
</view>
<view class="row item bothSide verCenter ">
<view class="row item bothSide verCenter " @click="userCoupon(item.user_coupon_id)" :class="{'act':item.user_coupon_id==user_coupon_id}" v-for="(item,index) in user_coupon" :key="index">
<view class="left row ">
<view class="bsri column rowCenter verCenter">
<view class="p1">
<text class="t1">￥</text>
<text class="t2">10</text>
<text class="t2">{{ Number(item.sale_amount).toFixed(2) }}</text>
</view>
<view class="p2">满￥200可用</view>
<view class="p2">{{item.require_desc}}</view>
</view>
<view class="textbox">
<view class="elep">新人528元优惠券</view>
<text>2023.02.27-2023.04.0</text>
<view class="elep">{{item.coupon_name}}</view>
<text>{{ item.create_time }} - {{ item.end_time }}</text>
</view>
</view>
<text class="noxz"></text>
<text class="icon iconfont icon-xzs"></text>
</view>
<view class="row item bothSide verCenter ">
<view class="left row ">
<view class="bsri column rowCenter verCenter">
<view class="p1">
<text class="t1">￥</text>
<text class="t2">10</text>
</view>
<view class="p2">满￥200可用</view>
</view>
<view class="textbox">
<view class="elep">新人528元优惠券</view>
<text>2023.02.27-2023.04.0</text>
</view>
</view>
<text class="noxz"></text>
<text class="icon iconfont icon-xzs"></text>
</view>
<view class="row item verCenter bothSide notitem">
<view class="row item verCenter bothSide notitem" :class="{'act':user_coupon_id==-1}" @click="userCoupon(-1)">
<view class="nqsj">不使用优惠券</view>
<text class="noxz"></text>
<text class="icon iconfont icon-xzs"></text>
</view>
</view>
<view class="subyhq row verCenter rowCenter"><text class="row rowCenter verCenter">确定</text></view>
<view class="subyhq row verCenter rowCenter"><text class="row rowCenter verCenter" @click="chooseCoupon()">确定</text></view>
</view>
<view class="noyhq" style="display:none;">
<view class="noyhq" v-if="user_coupon.length==0">
<image src="../../static/nodate.png"></image>
<view class="row rowCenter">暂时优惠券数据</view>
</view>
</view>
<view class="contenty nouse" style="display:none">
<view class="contenty nouse" v-show="!coupon">
<view class="yhcons">
<view class="row item bothSide verCenter act">
<view class="row item bothSide verCenter " v-for="(item,index) in user_couponNo" :key="index">
<view class="left row ">
<view class="bsri column rowCenter verCenter">
<view class="p1">
<text class="t1">￥</text>
<text class="t2">10</text>
<text class="t2">{{ Number(item.sale_amount).toFixed(2) }}</text>
</view>
<view class="p2">满￥200可用</view>
<view class="p2">{{item.require_desc}}</view>
</view>
<view class="textbox">
<view class="elep">新人528元优惠券</view>
<text>2023.02.27-2023.04.0</text>
<view class="elep">{{item.coupon_name}}</view>
<text>{{ item.create_time }} - {{ item.end_time }}</text>
</view>
</view>
<text class="noxz"></text>
</view>
</view>
<view class="noyhq" style="display:none;">
<view class="noyhq" v-if="user_couponNo.length==0">
<image src="../../static/nodate.png"></image>
<view class="row rowCenter">暂时优惠券数据</view>
</view>
......@@ -278,13 +226,13 @@
<view class="cons">
<view class="inputgroup row verCenter">
<text class="label"><text class="blue">*</text>提货人</text>
<input type="text" placeholder="请输入收货人" />
<input type="text" placeholder="请输入收货人" v-model="ztname"/>
</view>
<view class="inputgroup row verCenter">
<text class="label"><text class="blue">*</text>联系电话</text>
<input type="text" placeholder="请输入联系人电话" />
<input type="text" placeholder="请输入联系人电话" v-model="ztphone"/>
</view>
<view class="bcztper">保存信息</view>
<view class="bcztper" @click="ztsubmit">保存信息</view>
</view>
</view>
</uni-popup>
......@@ -309,6 +257,27 @@
</uni-popup>
<!--附加费-->
<uni-popup ref="fjfpopup" type="bottom">
<view class="fjf-pop" >
<view class="poppbox" >
<view class="cons" >
<view class="pophead row bothSide">
<text class="tits">附加费</text>
<text class="icon iconfont icon-xxx" @click="closefjf()"></text>
</view>
<view class="popcons">
<view class="items row bothSide" v-for="(item,index) in obj_.extend_items" :key="index">
<text>{{item.supplier_name}}</text>
<text>{{item.extend_fee_format}}</text>
</view>
</view>
</view>
</view>
</view>
</uni-popup>
</view>
......@@ -322,23 +291,199 @@
export default {
data() {
return {
pival:"",//pi合同
shipping_type:1,
currency:1,
goods_type:1,
ktaddress:{},
fpinfo:{},
ztaddressid:1,//自提地址ID
ztaddress:{},//自提地址信息
obj_:{list:[]},
ztname:"",
ztphone:"",
remarks:"",//订单备注
user_coupon_id:-1,//优惠券ID -1 不用
user_coupon:[],//优惠券列表 可使用
user_couponNo:[],//优惠券列表 //不可使用
coupon:true,//true 可使用 //不可使用
}
},
onShow() {
onLoad(option){
this.getData();
this.getAddress(option.address_id)
this.getUserCoupon()
if(option.tax_id){
this.getInvoice(option.tax_id)
}
},
methods: {
//切换优惠券
userCoupon(id_){
this.user_coupon_id=id_
},
//选择优惠券
chooseCoupon(){
this.getData()
this.closeyyq()
},
//提交订单
creatOrder(){
let data_={
cart_id:uni.getStorageSync('car_xk'),
pay_type:1,//1 全额付款 2预付款30%,
shipping_type:this.shipping_type,
address_id:(this.shipping_type==1?this.ktaddress.address_id:this.ztaddressid),
remark:this.remarks,
self_consignee:this.obj_.ztname||"",
self_mobile:this.obj_.ztphone||"",
user_coupon_id:this.user_coupon_id, // -1 不使用优惠券
}
if(this.currency==1){
data_.send_type=2//拼单发货2 1自营优先发货
data_.tax_id=this.fpinfo.tax_id||0 //0 不要发票
}else{
data_.contract_com_name=this.pival
}
console.log(data_)
this.request(Api_Url + '/order/create', 'POST',data_, true, true).then(res => {
if(res.err_code==0){
uni.showToast({
title: "提交订单成功",
duration: 2000,
icon:"none"
})
setTimeout(()=>{
uni.navigateTo({
url: '/order/success?order_id='+res.data
});
},2000)
}else{
uni.showToast({
title: res.err_msg,
duration: 2000,
icon:"none"
})
}
});
},
//提交自提信息
ztsubmit(){
if(!this.ztname){
uni.showToast({
title: "请输入提货人",
duration: 2000,
icon:"none"
})
return
}
if(!this.ztphone){
uni.showToast({
title: "请输入提货电话",
duration: 2000,
icon:"none"
})
return
}
this.obj_.ztname=this.ztname
this.obj_.ztphone=this.ztphone
this.$forceUpdate();
this.closezt()
},
//获取优惠券
getUserCoupon(){
this.request(Api_Url + '/ucoupon/showuse', 'POST', {coupon_mall_type:3,cart_ids:uni.getStorageSync('car_xk'),}, false, true).then(res => {
if(res.err_code==0){
let arr_=res.data||[];
if(arr_.length==0){
return
}
arr_.forEach(item=>{
if(item.remark==0){
this.user_coupon.push(item)
}else{
this.user_couponNo.push(item)
}
})
if(this.user_coupon.length>0){
this.user_coupon_id=this.user_coupon[0].user_coupon_id
this.getData()
}
}
});
},
//获取商品信息
getData(){
this.request(Api_Url + '/cart/confirm', 'POST', {cart_id:uni.getStorageSync('car_xk'),shipping_type:this.shipping_type,user_coupon_id:this.user_coupon_id}, true, true).then(res => {
if(res.err_code==0){
this.currency=res.data.currency
this.obj_=res.data
this.getSelfaddress()
}else if(res.err_code==11012){
uni.showToast({
title: res.err_msg,
duration: 2000,
icon:"none"
})
setTimeout(()=>{
uni.navigateTo({
url: '/login'
});
},2000)
}
});
},
//获取发票信息
getInvoice(tax_id){
this.request(Api_Url + '/invoice/lists', 'POST', {limit:1000,p:1}, false, true).then(res => {
if(res.err_code==0){
let arr_=res.data.list||[];
arr_.forEach(item=>{
if(tax_id==item.tax_id){
this.fpinfo=item
}
})
}
});
},
//获取快递地址
getAddress(address_id){
this.request(Api_Url + '/address/recvlist', 'POST', {}, false, true).then(res => {
if(res.err_code==0){
let arr_=res.data||[];
if(arr_.length==0){
return
}
this.ktaddress=arr_[0]
arr_.forEach(item=>{
if(address_id){
if(address_id==item.address_id){
this.ktaddress=item
}
}else{
if(item.is_defaut==1){
this.ktaddress=item
}
}
})
console.log(this.ktaddress)
}
});
},
//获取自提地址
getSelfaddress(){
this.request(Api_Url + '/cart/selfaddress', 'POST', {}, true, true).then(res => {
this.request(Api_Url + '/cart/selfaddress', 'POST', {order_goods_type:1,currency:this.currency}, false, true).then(res => {
if(res.err_code==0){
this.ztaddress=res.data[Object.keys(res.data)[0]]
this.ztaddressid=Object.keys(res.data)[0]
}
});
},
shippingtypetab(type){
......@@ -356,6 +501,12 @@
closeyf() {
this.$refs.yfpopup.close();
},
openfjf() {
this.$refs.fjfpopup.open('bottom');
},
closefjf() {
this.$refs.fjfpopup.close();
},
openyyq() {
this.$refs.popupyyq.open('bottom');
},
......
pages/confirm/confirmSuccess.vue
......@@ -20,20 +20,42 @@
<navigator url="/user/shoporder" class="ckorder">查看订单</navigator>
<view class="tsu3 row rowCenter">
<text>订单编号：</text>
<navigator url="/user/orderdetail" class="ckorderdetail">12022071810404SZ</navigator>
<navigator :url="'/user/orderdetail?order_id='+this.obj_.order_id" class="ckorderdetail">{{this.obj_.order_sn}}</navigator>
</view>
</view>
</template>
<script>
import {
Ichunt_Api,
Api_Url
} from '@/util/api.js';
export default {
data() {
return {
kfurl:""
kfurl:"",
obj_:{}
}
},
mounted() {
setTimeout(() => {
this.kfurl = this.$globalData.kfqq_xk;
}, 500);
},
onLoad(option){
console.log(option.order_id)
this.getData(option.order_id);
},
methods: {
getData(order_id){
this.request(Api_Url + '/order/info', 'POST',{order_id:order_id}, true, true).then(res => {
if(res.err_code==0){
this.obj_=res.data
}else{
}
});
}
}
}
</script>
......
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 sign in to comment