diff --git a/app.json b/app.json
index 1e5a2076d2154a15c523339e84b909c20e6aa0e1..0be6142bed5b801974110d5fe7898dc4f44f3d7f 100755
--- a/app.json
+++ b/app.json
@@ -4,7 +4,8 @@
"pages/classify/index",
"pages/discover/index",
"pages/shopping-cart/index",
- "pages/mine/index"
+ "pages/mine/index",
+ "biz-component/coupon/index"
],
"subpackages": [
{
@@ -34,10 +35,10 @@
]
},
{
- "root": "pagesShopingCart",
+ "root": "pagesOrder",
"pages": [
- "confirm-order/index",
- "discount-coupon/index "
+ "confirm/index",
+ "discount-coupon/index"
]
}
],
diff --git a/biz-component/coupon/index.js b/biz-component/coupon/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..8016ed8af958ab6eab24b4f3111eb2cf4b5ffc52
--- /dev/null
+++ b/biz-component/coupon/index.js
@@ -0,0 +1,29 @@
+Component({
+ options:{
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ properties: {
+ price:{//优惠券值
+ type:String,
+ value:''
+ },
+ title:{//优惠券title
+ type:String,
+ value:''
+ },
+ desc:{// 优惠券描述
+ type:String,
+ value:''
+ },
+ date:{// 过期时间
+ type:String,
+ value:''
+ },
+ overTime:{// 是否过期
+ type:Boolean,
+ value: false
+ }
+
+ },
+})
diff --git a/pagesShopingCart/discount-coupon/index .json b/biz-component/coupon/index.json
similarity index 100%
rename from pagesShopingCart/discount-coupon/index .json
rename to biz-component/coupon/index.json
diff --git a/biz-component/coupon/index.wxml b/biz-component/coupon/index.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..27d4ed6a5bb8d2a6785dc0d045ecb30f7823c760
--- /dev/null
+++ b/biz-component/coupon/index.wxml
@@ -0,0 +1,19 @@
+
+
+
+
+ ￥{{price}}
+
+
+
+
+ {{title}}
+
+ {{desc}}
+ {{date}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/biz-component/coupon/index.wxss b/biz-component/coupon/index.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..e56a3c40c21d93912f9f4c2466e524cfb6fcb332
--- /dev/null
+++ b/biz-component/coupon/index.wxss
@@ -0,0 +1,27 @@
+/* biz-component/coupon/index.wxss */
+.coupon{
+ background-color: #ffffff;
+ border-radius: 16rpx;
+}
+.coupon-left{
+ height: 200rpx;
+ width: 248rpx;
+ border-right: 1px dotted #D6D6D6;
+ font-size: 60rpx;
+ font-weight: 600;
+}
+.coupon-right{
+ height: 200rpx;
+ margin-left: 30rpx;
+ width: 100%;
+ padding-right: 30rpx;
+ position: relative;
+}
+.coupon-right-title{
+ height: 60rpx;
+}
+
+.unacitve{
+ color:#D6D6D6;
+ border-color: #D6D6D6;
+}
\ No newline at end of file
diff --git a/component/subsection/index.wxss b/component/subsection/index.wxss
index a24dc56bc39d3ee636eead119cfe189242916be8..d23b6e7a771d4e3e0dff85f8a38a27c80f0a4153 100644
--- a/component/subsection/index.wxss
+++ b/component/subsection/index.wxss
@@ -14,6 +14,7 @@
flex-direction: row;
justify-content: center;
align-items: center;
+ border-right: 1rpx solid;
}
.subsection-item:first-child{
@@ -21,4 +22,5 @@
}
.subsection-item:last-child{
border-radius: 0 14rpx 14rpx 0;
-}
\ No newline at end of file
+ border-right: none;
+}
diff --git a/images/common/coupon_overdue.png b/images/common/coupon_overdue.png
new file mode 100644
index 0000000000000000000000000000000000000000..df88e34e0f91f928af3c5b42e55ff1a8ce516371
Binary files /dev/null and b/images/common/coupon_overdue.png differ
diff --git a/images/common/empty_coupon.png b/images/common/empty_coupon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bd484157fd2e48565b5b49fb3ffe196da215cbd
Binary files /dev/null and b/images/common/empty_coupon.png differ
diff --git a/images/order/order_border.png b/images/order/order_border.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d1cfb32f28a24c0e21c299ed5254b9867f6d9b1
Binary files /dev/null and b/images/order/order_border.png differ
diff --git a/pages/shopping-cart/index.js b/pages/shopping-cart/index.js
index 04d1180800c9d0308f746bdbc36df0fdf754450b..1fb83c3b72f2a43233c6c53778d8a39c62ffbf96 100644
--- a/pages/shopping-cart/index.js
+++ b/pages/shopping-cart/index.js
@@ -31,7 +31,7 @@ Page({
},
confirm(){
console.log('去结算')
- this.router("/pagesShopingCart/confirm-order/index")
+ this.router("/pagesOrder/confirm/index")
},
onLoad(){
setTimeout(()=>{
diff --git a/pagesOrder/confirm/index.js b/pagesOrder/confirm/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..d09e86de1c0426dacbf960f91a228ca7da94503b
--- /dev/null
+++ b/pagesOrder/confirm/index.js
@@ -0,0 +1,87 @@
+import images from '../../utils/images.js'
+const app = getApp()
+Page({
+ ...app.globalData.function,
+ data: {
+ ...app.globalData.config,
+ subsectionList:[
+ {name: '自提', key: 1},
+ {name: '配送', key: 2},
+ ],
+ shoppingCartList: [
+ {name: '贴布日式圆盘特殊日本木质茶盘', spec: '默认', url: images.goods1, price: '198', num: 1},
+ {name: '商务办公用茶-水仙', spec: '一斤装', url: images.goods2, price: '122', num: 2},
+ ],
+ info:{
+ 1:{
+ name:'黄先生',
+ phone: null,
+ address:'福建省厦门市思明区湖滨南路227号之7号（屋后茶山香苑）'
+ },
+ },
+ current: 1,
+ totalNum:0,
+ totalPrice:0,
+ confirmPrice:0,
+ discountPrice:0,
+ discountId:0,
+ },
+ onLoad(options){
+ let discountPrice = options.discountPrice || 0;
+ this.setData({discountPrice})
+ setTimeout(()=>{
+ this.computedData();
+ this.setData({
+ current: 1,
+ })
+ },1000)
+ },
+ // 计算价格
+ computedData(){
+ let totalNum = 0;
+ let totalPrice = 0;
+ let confirmPrice = 0;
+ this.data.shoppingCartList.forEach(ele =>{
+ totalNum += ele.num;
+ totalPrice += ele.num * ele.price;
+ });
+ confirmPrice = totalPrice - this.data.discountPrice;
+ this.setData({
+ totalNum,
+ totalPrice,
+ confirmPrice
+ })
+ },
+ bindInputNumber(e){
+ let num = e.detail.value
+ let shoppingCartList = this.data.shoppingCartList
+ const index = e.currentTarget.dataset.index
+ if(num===0){
+ this.$showModal({content: '确定要删除此商品？'}).then(res=>{
+ if(res.confirm){
+ console.log("确认删除")
+ }else{
+ console.log("取消删除")
+ }
+ })
+ }
+ shoppingCartList[index].num = num
+ this.setData({
+ shoppingCartList
+ });
+ this.computedData();
+ },
+ // 分段器change方法
+ subsectionChange(e){
+ this.setData({current:e.detail})
+ },
+ confirm(){
+ this.$showModal({content: '确定支付'}).then(res=>{
+ if(res.confirm){
+ console.log("确认删除")
+ }else{
+ console.log("取消删除")
+ }
+ })
+ }
+})
\ No newline at end of file
diff --git a/pagesShopingCart/confirm-order/index.json b/pagesOrder/confirm/index.json
similarity index 36%
rename from pagesShopingCart/confirm-order/index.json
rename to pagesOrder/confirm/index.json
index bd801f44513653987adb33b791fb2a521ee3f59c..df06cdc461f68a0dfe6360965267debfe49bc6b9 100644
--- a/pagesShopingCart/confirm-order/index.json
+++ b/pagesOrder/confirm/index.json
@@ -1,6 +1,11 @@
{
"usingComponents": {
- "subsection": "/component/subsection/index"
+ "subsection": "/component/subsection/index",
+ "iconfont": "/component/iconfont/index",
+ "t-cell": "/itriton/cell/index",
+ "t-image": "/itriton/image/index",
+ "t-submit-bar": "/itriton/submit-bar/index",
+ "t-input-number": "/itriton/input-number/index"
},
"navigationBarTitleText": "确认订单",
"navigationBarBackgroundColor": "#ffffff",
diff --git a/pagesOrder/confirm/index.wxml b/pagesOrder/confirm/index.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..64cb2ca846c46095aafb54bdc8f9fdfd6a75baeb
--- /dev/null
+++ b/pagesOrder/confirm/index.wxml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+ 添加收货地址
+
+
+
+
+
+
+ {{info[current].name}}
+ {{info[current].phone}}
+ {{info[current].address}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.spec}}
+
+
+ ￥{{item.price}}
+
+
+
+
+
+
+
+ 运费
+ ￥0
+
+
+ 共{{totalNum}}件
+ 小计：
+ ￥{{totalPrice}}
+
+
+
+
+
+ 优惠券
+ -￥{{discountPrice}}
+
+
+
+
+
+
+ 合计：
+ ¥{{confirmPrice}}
+
+
+
\ No newline at end of file
diff --git a/pagesOrder/confirm/index.wxss b/pagesOrder/confirm/index.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..7ae675d97e9388b28d0a303c5e56cbbe8b939e2f
--- /dev/null
+++ b/pagesOrder/confirm/index.wxss
@@ -0,0 +1,36 @@
+/* pagesOrder/confirm/index.wxss */
+.confirm-wrap{
+ background-color: #fff;
+}
+
+.confirm-address-add{
+ height: 174rpx;
+}
+
+.confirm-address-icon{
+ height: 134rpx;
+}
+
+.confirm-address-wrap{
+ width: 602rpx;
+ height: 134rpx;
+}
+
+.confirm-address-line{
+ width: 750rpx;
+ height: 4rpx;
+ background-color: gray;
+}
+
+.confirm-wrap-content{
+ height: 152rpx;
+}
+
+.confirm-wrap-image{
+ width: 152rpx;
+ height: 152rpx;
+ background: rgba(0, 0, 0, 0);
+ border: 1rpx solid #E5E9E8;
+ opacity: 1;
+ border-radius: 16rpx;
+}
diff --git a/pagesOrder/discount-coupon/index.js b/pagesOrder/discount-coupon/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..f399149e4fdcb7b3494f96b0ad3f221a1976223f
--- /dev/null
+++ b/pagesOrder/discount-coupon/index.js
@@ -0,0 +1,62 @@
+import images from '../../utils/images.js'
+const app = getApp()
+Page({
+ ...app.globalData.function,
+ data: {
+ ...app.globalData.config,
+ couponList:[
+ {price: 10, title: '无门槛优惠券1', desc: '满100元减10元', date: '2020.07.15-2020.07.18', overTime: true, id: 1},
+ {price: 20, title: '无门槛优惠券2', desc: '满100元减20元', date: '2020.07.15-2022.07.18', overTime: false, checked: false, id: 2},
+ {price: 30, title: '无门槛优惠券3', checked: false, desc: '满100元减30元', date: '2020.07.15-2050.07.18', overTime: false, id: 3},
+ ],
+ discountPrice: 0,
+ discountId:0,
+ flag: null,
+ },
+ onLoad(options){
+ let flag = options.flag;
+ let discountId = options.discountId;
+ console.log(options)
+ let couponList = this.data.couponList;
+ let discountPrice = this.data.discountPrice;
+ couponList.forEach((ele,index) =>{
+ if(+discountId === ele.id){
+ ele.checked = !ele.checked;
+ ele.checked ? discountPrice = ele.price : null;
+ ele.checked ? discountId = ele.id : null;
+ }
+ if(+discountId !== ele.id){
+ ele.checked = false;
+ }
+ })
+ this.setData({flag,couponList,discountPrice,discountId})
+ wx.setNavigationBarTitle({
+ title: flag == 1 ? '选择优惠券' : '礼券中心',
+ })
+ },
+
+ checkChange(e){
+ let couponList = this.data.couponList;
+ let discountPrice = this.data.discountPrice;
+ let discountId = this.data.discountId;
+ couponList.forEach((ele,index) =>{
+ if(index === e.target.dataset.index){
+ ele.checked = !ele.checked;
+ ele.checked ? discountPrice = ele.price : null;
+ ele.checked ? discountId = ele.id : null;
+ }
+ if(index !== e.target.dataset.index){
+ ele.checked = false;
+ }
+ })
+ this.setData({couponList,discountPrice,discountId})
+ },
+ confirm(){
+ const prevPage = this.$page(-1);
+ const discountPrice = this.data.discountPrice;
+ const discountId = this.data.discountId;
+ prevPage.setData({discountPrice,discountId})
+ prevPage.computedData();
+ this.back();
+ }
+})
\ No newline at end of file
diff --git a/pagesOrder/discount-coupon/index.json b/pagesOrder/discount-coupon/index.json
new file mode 100644
index 0000000000000000000000000000000000000000..bc7ca1e19c44933f68f0f1bcdbe64174f659fd73
--- /dev/null
+++ b/pagesOrder/discount-coupon/index.json
@@ -0,0 +1,14 @@
+{
+ "usingComponents": {
+ "coupon": "/biz-component/coupon/index",
+ "subsection": "/component/subsection/index",
+ "iconfont": "/component/iconfont/index",
+ "t-cell": "/itriton/cell/index",
+ "t-image": "/itriton/image/index",
+ "t-submit-bar": "/itriton/submit-bar/index",
+ "t-input-number": "/itriton/input-number/index"
+ },
+ "navigationBarTitleText": "礼券中心",
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
+}
\ No newline at end of file
diff --git a/pagesOrder/discount-coupon/index.wxml b/pagesOrder/discount-coupon/index.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..6242aac6eccf7dc41eddae70311c685025a75cec
--- /dev/null
+++ b/pagesOrder/discount-coupon/index.wxml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 可优惠：
+ ¥{{discountPrice}}
+
+
+
+
\ No newline at end of file
diff --git a/pagesOrder/discount-coupon/index.wxss b/pagesOrder/discount-coupon/index.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..b080fba4dec705b5a83e11976e285482f308f361
--- /dev/null
+++ b/pagesOrder/discount-coupon/index.wxss
@@ -0,0 +1,8 @@
+/* pagesOrder/discount-coupon/index.wxss */
+.over-time-image{
+ position: absolute;
+ width: 108rpx;
+ height: 84rpx;
+ right: 20rpx;
+ top: 0rpx
+}
\ No newline at end of file
diff --git a/pagesShopingCart/confirm-order/index.js b/pagesShopingCart/confirm-order/index.js
deleted file mode 100644
index 4519ce18bbdda352add99e9f2f0cb79c3db3e3c3..0000000000000000000000000000000000000000
--- a/pagesShopingCart/confirm-order/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// pagesGoods/detail/index.js
-const app = getApp()
-Page({
- ...app.globalData.function,
- data: {
- ...app.globalData.config,
- subsectionList:[
- {name: '自提', key: 1},
- {name: '配送', key: 2},
- {name: '随机', key: 3}
- ],
- current: 1
- },
- showSpecs(){
-
- },
- onLoad(){
- setTimeout(()=>{
- this.setData({
- current: 2
- })
- },3000)
- },
- subsectionChange(current){
- }
-})
\ No newline at end of file
diff --git a/pagesShopingCart/confirm-order/index.wxml b/pagesShopingCart/confirm-order/index.wxml
deleted file mode 100644
index dffaae44a44df0879f80e47c31d0c97b1c7532f3..0000000000000000000000000000000000000000
--- a/pagesShopingCart/confirm-order/index.wxml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/pagesShopingCart/confirm-order/index.wxss b/pagesShopingCart/confirm-order/index.wxss
deleted file mode 100644
index ebede2742fbe956ca49602414aaabdf7606178bf..0000000000000000000000000000000000000000
--- a/pagesShopingCart/confirm-order/index.wxss
+++ /dev/null
@@ -1,4 +0,0 @@
-/* pagesShopingCart/confirm-order/index.wxss */
-.configm-wrap{
- background-color: #fff;
-}
\ No newline at end of file
diff --git a/pagesShopingCart/discount-coupon/index .js b/pagesShopingCart/discount-coupon/index .js
deleted file mode 100644
index d2590b2576288b49be085a54dc6459f00c8316df..0000000000000000000000000000000000000000
--- a/pagesShopingCart/discount-coupon/index .js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pagesShopingCart/discount-coupon/index .js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pagesShopingCart/discount-coupon/index .wxml b/pagesShopingCart/discount-coupon/index .wxml
deleted file mode 100644
index 40a3c81ac32ba2252b239ffd16bfe3c88da2e163..0000000000000000000000000000000000000000
--- a/pagesShopingCart/discount-coupon/index .wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-选择优惠券
diff --git a/pagesShopingCart/discount-coupon/index .wxss b/pagesShopingCart/discount-coupon/index .wxss
deleted file mode 100644
index 44f088788094adfa3dbb233d73556900b3433cfd..0000000000000000000000000000000000000000
--- a/pagesShopingCart/discount-coupon/index .wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pagesShopingCart/discount-coupon/index .wxss */
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 1a125c4c80c9f94f060501bc1c06d31f9752053e..7a17eaeb0966ca9dc60f43cc5e85d1dd012d2d82 100755
--- a/project.config.json
+++ b/project.config.json
@@ -1,83 +1,82 @@
{
- "description": "项目配置文件",
- "packOptions": {
- "ignore": []
- },
- "setting": {
- "urlCheck": false,
- "es6": true,
- "enhance": true,
- "postcss": true,
- "preloadBackgroundData": false,
- "minified": true,
- "newFeature": true,
- "coverView": true,
- "nodeModules": true,
- "autoAudits": false,
- "showShadowRootInWxmlPanel": true,
- "scopeDataCheck": false,
- "uglifyFileName": false,
- "checkInvalidKey": true,
- "checkSiteMap": true,
- "uploadWithSourceMap": true,
- "compileHotReLoad": false,
- "lazyloadPlaceholderEnable": false,
- "useMultiFrameRuntime": true,
- "useApiHook": true,
- "useApiHostProcess": true,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
+ "description": "项目配置文件",
+ "packOptions": {
+ "ignore": []
},
- "enableEngineNative": false,
- "useIsolateContext": true,
- "userConfirmedBundleSwitch": false,
- "packNpmManually": false,
- "packNpmRelationList": [],
- "minifyWXSS": true,
- "disableUseStrict": false,
- "minifyWXML": true,
- "showES6CompileOption": false,
- "useCompilerPlugins": false
- },
- "compileType": "miniprogram",
- "libVersion": "2.19.6",
- "appid": "wx85bcfc1234f32ac1",
- "projectname": "ibaleine-weapp",
- "debugOptions": {
- "hidedInDevtools": []
- },
- "isGameTourist": false,
- "simulatorType": "wechat",
- "simulatorPluginLibVersion": {},
- "condition": {
- "search": {
- "list": []
+ "setting": {
+ "urlCheck": false,
+ "es6": true,
+ "enhance": true,
+ "postcss": true,
+ "preloadBackgroundData": false,
+ "minified": true,
+ "newFeature": true,
+ "coverView": true,
+ "nodeModules": true,
+ "autoAudits": false,
+ "showShadowRootInWxmlPanel": true,
+ "scopeDataCheck": false,
+ "uglifyFileName": false,
+ "checkInvalidKey": true,
+ "checkSiteMap": true,
+ "uploadWithSourceMap": true,
+ "compileHotReLoad": false,
+ "lazyloadPlaceholderEnable": false,
+ "useMultiFrameRuntime": false,
+ "useApiHook": false,
+ "useApiHostProcess": false,
+ "babelSetting": {
+ "ignore": [],
+ "disablePlugins": [],
+ "outputPath": ""
+ },
+ "enableEngineNative": false,
+ "useIsolateContext": true,
+ "userConfirmedBundleSwitch": false,
+ "packNpmManually": false,
+ "packNpmRelationList": [],
+ "minifyWXSS": true,
+ "disableUseStrict": false,
+ "showES6CompileOption": false,
+ "useCompilerPlugins": false
},
- "conversation": {
- "list": []
+ "compileType": "miniprogram",
+ "libVersion": "2.17.0",
+ "appid": "touristappid",
+ "projectname": "ibaleine-weapp",
+ "debugOptions": {
+ "hidedInDevtools": []
},
- "plugin": {
- "list": []
- },
- "game": {
- "currentL": -1,
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
- "miniprogram": {
- "list": [
- {
- "id": 0,
- "name": "pages/index/index",
- "pathName": "pages/index/index",
- "query": "",
- "scene": 1011
+ "isGameTourist": false,
+ "simulatorType": "wechat",
+ "simulatorPluginLibVersion": {},
+ "condition": {
+ "search": {
+ "list": []
+ },
+ "conversation": {
+ "list": []
+ },
+ "plugin": {
+ "list": []
+ },
+ "game": {
+ "currentL": -1,
+ "list": []
+ },
+ "gamePlugin": {
+ "list": []
+ },
+ "miniprogram": {
+ "list": [
+ {
+ "id": 0,
+ "name": "pages/index/index",
+ "pathName": "pages/index/index",
+ "query": "",
+ "scene": 1011
+ }
+ ]
}
- ]
}
- }
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index ef4dd699313799c9d219a5505df683af004ae529..7b411fd1d04b31316bc538c77eae18774e0b3f16 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,72 +1,78 @@
{
- "setting": {},
- "condition": {
- "plugin": {
- "list": []
- },
- "game": {
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
- "miniprogram": {
- "list": [
- {
- "name": "pages/discover/index",
- "pathName": "pages/discover/index",
- "query": "",
- "scene": null
+ "setting": {},
+ "condition": {
+ "plugin": {
+ "list": []
},
- {
- "name": "pages/classify/index",
- "pathName": "pages/classify/index",
- "query": "",
- "scene": null
+ "game": {
+ "list": []
},
- {
- "name": "pagesGoods/detail/index",
- "pathName": "pagesGoods/detail/index",
- "query": "",
- "scene": null
+ "gamePlugin": {
+ "list": []
},
- {
- "name": "",
- "pathName": "pages/mine/index",
- "query": "",
- "scene": null
- },
- {
- "name": "",
- "pathName": "pagesMine/address/list/index",
- "query": "",
- "scene": null
- },
- {
- "name": "",
- "pathName": "pagesMine/address/add-edit/index",
- "query": "type=c",
- "scene": null
- },
- {
- "name": "",
- "pathName": "pages/shopping-cart/index",
- "query": "",
- "scene": null
- },
- {
- "name": "",
- "pathName": "pagesShopingCart/confirm-order/index",
- "query": "",
- "scene": null
- },
- {
- "name": "",
- "pathName": "pagesShopingCart/confirm-order/index",
- "query": "",
- "scene": null
+ "miniprogram": {
+ "list": [
+ {
+ "name": "pages/discover/index",
+ "pathName": "pages/discover/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "pages/classify/index",
+ "pathName": "pages/classify/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "pagesGoods/detail/index",
+ "pathName": "pagesGoods/detail/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/mine/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pagesMine/address/list/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pagesMine/address/add-edit/index",
+ "query": "type=c",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/shopping-cart/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pagesOrder/confirm/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "pagesOrder/discount-coupon/index",
+ "pathName": "pagesOrder/discount-coupon/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "name": "pagesOrder/discount-coupon/index",
+ "pathName": "pagesOrder/discount-coupon/index",
+ "query": "",
+ "scene": null
+ }
+ ]
}
- ]
}
- }
}
\ No newline at end of file
diff --git a/styles/iconfont.wxss b/styles/iconfont.wxss
index b4f42e70435b57d457c77ccabe9a9e862c471733..51de626bd288b6b9be8acf63f7ddd288f070f36b 100755
--- a/styles/iconfont.wxss
+++ b/styles/iconfont.wxss
@@ -68,3 +68,7 @@
.icon-share:before {
content: "\e64d";
}
+
+.icon-plus:before {
+ content: "\e60a";
+}
\ No newline at end of file
diff --git a/utils/business.js b/utils/business.js
index f83aa620cf3d1e6cab7c24f08176afe0fc70a00c..f45d09560b2edacd82d38c4ffd880c3def850962 100755
--- a/utils/business.js
+++ b/utils/business.js
@@ -73,4 +73,10 @@ export const cloneFormData = () => {
...formData
}
})
+}
+
+export const $page = (delta) => {
+ const pages = getCurrentPages();
+ const len = pages.length;
+ return pages[len - 1 + delta]
}
\ No newline at end of file