diff --git a/app.js b/app.js index 87c748c..f062e34 100644 --- a/app.js +++ b/app.js @@ -38,7 +38,7 @@ App({ // 获取前端配置文件 commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest137? true : false; + data.isTest = data.isTest139? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/app.json b/app.json index 2cfabeb..0847ea2 100644 --- a/app.json +++ b/app.json @@ -182,9 +182,7 @@ "pages/order/WineSceneOrder/index", "pages/order/showOrderNew/index", "pages/user/order/showOrderInfo/index", - "pages/user/suggest/suggest", - "pages/list/foodNew/index", - "pages/info/foodNew/index" + "pages/user/suggest/suggest" ], "subpackages": [ { @@ -204,7 +202,9 @@ "goods/oneCardTour/info/index", "feiyiNew/CGCIndex/index", "feiyiNew/CGCLetter/index", - "feiyiNew/CGCTime/index" + "feiyiNew/CGCTime/index", + "foodListNew/index", + "foodNew/index" ] }, { diff --git a/pages/component/kefu/index.js b/pages/component/kefu/index.js new file mode 100644 index 0000000..c3f255b --- /dev/null +++ b/pages/component/kefu/index.js @@ -0,0 +1,58 @@ +// pages/component/kefu/index.js +import commonApi from "../../../utils/https/common.js" +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + data: { + show: false, + showPhone: false, + info: "", + phones: [] + }, + lifetimes: { + attached() { + console.log('组件已挂载到页面'); + this.initData(); + } + }, + /** + * 组件的初始数据 + */ + + + + /** + * 组件的方法列表 + */ + methods: { + initData () { + commonApi._post("kefu_tips/getTips", {platform:'miniapp'}).then(res=>{ + if (res.data) { + this.setData({ + showPhone: res.data.is_online, + info: res.data.content, + phones: res.data.emergency_phones + }) + } + }) + }, + + hideModal: function () { + this.setData({ + show: false, + }) + this.triggerEvent('hideModal'); + }, + phoneCall:function(e){ + let phone = e.currentTarget.dataset.phone; + wx.makePhoneCall({ + phoneNumber: phone, + }) + }, + } +}) \ No newline at end of file diff --git a/pages/component/kefu/index.json b/pages/component/kefu/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/component/kefu/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/component/kefu/index.wxml b/pages/component/kefu/index.wxml new file mode 100644 index 0000000..5cb1074 --- /dev/null +++ b/pages/component/kefu/index.wxml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + {{item}} + + + + + 取消 + + + + \ No newline at end of file diff --git a/pages/component/kefu/index.wxss b/pages/component/kefu/index.wxss new file mode 100644 index 0000000..493b418 --- /dev/null +++ b/pages/component/kefu/index.wxss @@ -0,0 +1,88 @@ +.bg{ + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + overflow: hidden; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: center; +} +.modal-mask { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: #000; + opacity: 0.5; + overflow: hidden; + z-index: 200; + color: #fff; +} + +.modal-dialog { + width: 540rpx; + overflow: hidden; + position: relative; + z-index: 9999; + background: #FFFFFF; + border-radius: 20rpx; +} +.modal-content{ + padding: 38rpx 26rpx; +} + + +.modal-footer { + display: flex; + flex-direction: row; + height: 112rpx; + border-top: 1px solid #dedede; + + + color: #000000; + padding: 30rpx 0; + box-sizing: border-box; +} + + + + +.btn-confirms { + flex: 1; + text-align: center; + font-weight: normal !important; + box-sizing: border-box; + width: 50% !important; + padding: 0 !important; + line-height: 50rpx; + background: none; + color: #0C898F; + font-weight: 500; + font-size: 32rpx; +} +.btn-confirms.two { + color: #000000; +} + +.icon-close{ + position: absolute; + width: 27.33rpx; + height: 27.33rpx; + top: 39rpx; + right: 26rpx; +} +.icon-close image{ + width: 100%; + height: 100%; +} +.phone-container{ + text-align: center; + font-weight: 500; +font-size: 27rpx; +color: #0C898F; +line-height: 1.8; +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 1b0e9ea..f15e290 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -7,6 +7,7 @@ import commonApi from "../../utils/https/common" import userApi from "../../utils/https/user" import util from "../../utils/util" import https from "../../utils/https.js" +import { unix } from "dayjs" Page({ data: { @@ -1050,7 +1051,13 @@ Page({ if (app.globalData.innerAudioContext) { app.globalData.innerAudioContext.stop() } - }, + }, + + goAIUrl () { + wx.switchTab({ + url: '/pages/pbService/aiHelpYou/index', + }) + }, /** * 用户点击右上角分享 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 234c7dd..c69fb11 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -52,7 +52,6 @@ --> - {{item.menu_name}} @@ -85,10 +84,14 @@ - + + + + + - - + + + - + @@ -121,7 +125,7 @@ - + @@ -152,6 +156,26 @@ --> + + + + + + {{list[0].subtitle}} + + + + + + {{list[1].subtitle}} + + + + {{list[2].subtitle}} + + + + @@ -332,6 +356,9 @@ + + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 5a361aa..0e33f6c 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -7,6 +7,7 @@ overflow-y: auto; background-size: 100% 100%; background-repeat: no-repeat; + padding-bottom: 220rpx; /* background-color:#E8F9FA; */ } @@ -1038,4 +1039,67 @@ margin-top: 20rpx; margin-left: -6rpx; margin-right: 0rpx; + } + + .ai-fix{ + position: fixed; + width: 150.33rpx; + height: 200rpx; + bottom: 30rpx; + right: 24rpx; + z-index: 100; + } + .hot-prod-new{ + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + } + .hot-prod-left{ + width: 400rpx; + height: 350rpx; + position: relative; + } + .hot-prod-left .prod-img{ + width: 100%; + height: 100%; + border-radius: 20rpx; + } + .hot-prod-left .xpth-item-title{ + position: absolute; + width: 100%; + font-weight: 500; + font-size: 28rpx; + color: #FFFFFF; + bottom: 0; + left: 0; + right: 0; + top: 0; + height: 100%; + width: 100%; + background: linear-gradient(to bottom, rgba(0,0,0,0),rgba(0,0,0,0.5)) ; + display: flex; + border-radius: 20rpx; + padding: 0 8rpx 6rpx; + box-sizing: border-box; + overflow: hidden; + align-items: flex-end; + } + + .hot-prod-right{ + display: flex; + flex-direction: column; + justify-content: space-between; + height: 350rpx; + align-items: flex-end; + flex: 1; + width: 100rpx; + padding-left: 14rpx; + } + + .hot-prod-right .hot-right-item{ + + height: 167rpx; + width: 100%; + } \ No newline at end of file diff --git a/pages/info/foodProductInfo/index.js b/pages/info/foodProductInfo/index.js index 6a7fde7..316515d 100644 --- a/pages/info/foodProductInfo/index.js +++ b/pages/info/foodProductInfo/index.js @@ -62,12 +62,12 @@ Page({ id: options.id }) // 获取购物车按钮的位置 - // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) { - // console.log(res) - // that.setData({ - // cartTop: res.top - // }) - // }).exec() + wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) { + console.log(res) + that.setData({ + cartTop: res.top + }) + }).exec() if (options.ZTPoint) { this.setData({ ZTPoint: options.ZTPoint @@ -141,8 +141,8 @@ Page({ console.log(swiperRange) this.setData({ info: resData, - supplierId: res.data.supplier_id, - iShop: res.data.supplier_id ? true : false, + supplierId: res.data.scene_id, + iShop: res.data.scene_id ? true : false, swiperRange: swiperRange, }) diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml index df11404..52d4c9c 100644 --- a/pages/info/foodProductInfo/index.wxml +++ b/pages/info/foodProductInfo/index.wxml @@ -1,7 +1,7 @@ - + - + 店铺 @@ -146,16 +146,16 @@ - - 立即购买 + 加入购物车 + 立即购买 该商品已下架 - + diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 1f467da..473e478 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -24,18 +24,23 @@ 场馆 - + + + + 行李寄存 + 运河十景 + @@ -59,18 +64,18 @@ 游客中心 - + 行李寄存 - + 美食 diff --git a/pages/map/index.wxss b/pages/map/index.wxss index 9faef2f..240c678 100644 --- a/pages/map/index.wxss +++ b/pages/map/index.wxss @@ -583,7 +583,7 @@ display: flex; /* justify-content: space-around; */ flex-wrap: wrap; - width: calc(170rpx * 7); + width: calc(170rpx * 6); margin: 0 20rpx; } diff --git a/pages/order/components/date/index.wxss b/pages/order/components/date/index.wxss index 4c5d8e8..3ee82a9 100644 --- a/pages/order/components/date/index.wxss +++ b/pages/order/components/date/index.wxss @@ -123,6 +123,7 @@ right: 0; bottom: 0; padding-bottom: 50rpx; + z-index: 50; } .short-date { font-weight: 500; diff --git a/pages/order/food/index.js b/pages/order/food/index.js index bac89b3..1a3cf66 100644 --- a/pages/order/food/index.js +++ b/pages/order/food/index.js @@ -116,13 +116,13 @@ Page({ }) }, order:function(){ - if(!this.data.user){ - wx.showToast({ - title: '请输入联系人', - icon: 'none' - }) - return; - } + // if(!this.data.user){ + // wx.showToast({ + // title: '请输入联系人', + // icon: 'none' + // }) + // return; + // } if(!this.data.tel){ wx.showToast({ title: '请输入手机号', diff --git a/pages/order/food/index.wxml b/pages/order/food/index.wxml index 91d0358..4f4c5c3 100644 --- a/pages/order/food/index.wxml +++ b/pages/order/food/index.wxml @@ -19,10 +19,10 @@ {{productNum}} - + 手机号： diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml index d5c8c9c..2245a77 100644 --- a/pages/order/orderList/index.wxml +++ b/pages/order/orderList/index.wxml @@ -37,7 +37,7 @@ X{{item.num}} 出行人信息 - + 姓名：{{items.name}} diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index eb8dba9..6d9a940 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -65,7 +65,7 @@ Page({ ticket_type:app.globalData.product.sku.ticket_type || 1, isCar:options.isCar, is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard, - is_authentication:app.globalData.product.sku.sku_model.is_authentication, + is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0, is_real_name:app.globalData.product.sku.sku_model.is_real_name, date: app.globalData.product.date, time: app.globalData.product.time || {}, @@ -505,6 +505,8 @@ Page({ remark: remark, product_num: app.globalData.product.isGroup == 1 ? 1 : productNum, phone:this.data.phone,// 不实名的时候传的手机号参数 + // 美食预定 + reserve_mobile: product.product.type=="food"?this.data.phone:"", }], originate_order_id: this.data.kjId, gp_id: app.globalData.gp_id, @@ -541,8 +543,9 @@ Page({ if(app.globalData.list){ app.globalData.list[app.globalData.index] = this.data.product // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList - if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) { + if (!app.globalData.list[app.globalData.index].sku.sku_model.is_authentication) { app.globalData.list[app.globalData.index].phone = this.data.phone + // app.globalData.list[app.globalData.index].reserve_mobile = this.data.phone app.globalData.list[app.globalData.index].linkmanList = [] }else { app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList diff --git a/pages/user/order/foodOrderInfo/index.js b/pages/user/order/foodOrderInfo/index.js index 18adada..a21abf8 100644 --- a/pages/user/order/foodOrderInfo/index.js +++ b/pages/user/order/foodOrderInfo/index.js @@ -194,7 +194,7 @@ Page({ callPhone :function () { wx.makePhoneCall({ - phoneNumber: this.data.info.order_product_list[0].supplier_info.phone, + phoneNumber: this.data.info.order_product_list[0].scene_detail.tel, }) }, diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml index c015640..267a3d1 100644 --- a/pages/user/order/foodOrderInfo/index.wxml +++ b/pages/user/order/foodOrderInfo/index.wxml @@ -19,8 +19,8 @@ - - + + @@ -39,30 +39,42 @@ {{item.state_text}} - - 商品总额： - ￥{{info.total_money/100}} - - - 运费 - ￥{{info.total_post_fee/100}} - - - 优惠券： - -￥{{info.preference_money/100}} - - - 实付金额： - {{info.paid_money/100}} - - + + 小计 + ￥{{item.paid_money/100}} + + + + 商家信息 + + + {{info.order_product_list[0].supplier_info.shop_name}} + + + + 营业时间 + {{info.order_product_list[0].supplier_info.business_hours}} + + + + + + {{info.order_product_list[0].supplier_info.address}} + 据您约{{info.order_product_list[0].supplier_info.distance}}km + + + + + + + + - + 订单信息 @@ -102,8 +114,23 @@ 支付方式：{{pay_methods[info.pay_method]}} + + 商品总额：￥{{info.total_money/100}} + + + 运费：￥{{info.total_post_fee/100}} + + + 优惠券：-￥{{info.preference_money/100}} + + + 实付金额：{{info.paid_money/100}} + + + 剩余时间：00:{{minute}}:{{second}} + - 剩余时间：00:{{minute}}:{{second}} + 再次购买 退款详情 取消订单 diff --git a/pages/user/order/list.js b/pages/user/order/list.js index 584fcc5..978a08f 100644 --- a/pages/user/order/list.js +++ b/pages/user/order/list.js @@ -114,6 +114,11 @@ Page({ ajaxes.push(ajax); indexes.push(index); } + // 权益卡只展示第一个 + if (item.is_order_card_product==1) { + item.order_product_list = [item.order_product_list[0]] + } + item.orderNum = orderNum; }) console.log(ajaxes) @@ -141,7 +146,7 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; - item = this.getChild(item) + // item = this.getChild(item) util.gotoOrder(item) }, diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js index 6325b72..75339e3 100644 --- a/pages/user/order/postOrderInfo/index.js +++ b/pages/user/order/postOrderInfo/index.js @@ -23,7 +23,12 @@ Page({ pay_methods:app.globalData.pay_methods, tjList:[], showLoading:true, - ids:[] + ids:[], + + // 权益卡 + isCard: false, + cardPostList: [], + deliveryNum: 0, }, /** @@ -309,11 +314,36 @@ getInfo () { state = state + order.state; order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[] }) + + // 权益卡 + let cardPostList = []; + let isCard= false; + let deliveryNum = 0; + if (res.data.order_product_list.some(v=>v.order_card_product)) { + cardPostList = res.data.order_product_list.slice(1) + res.data.order_product_list = [res.data.order_product_list[0]] + isCard = true; + cardPostList.forEach(v=>{ + console.log(v) + if (v.order_card_product) { + v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1 + v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10) + v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10) + } + if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) { + deliveryNum += 1 + } + }) + } + this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, product_model:res.data.order_product_list[0].product_model, - ids: proId.join(",") + ids: proId.join(","), + cardPostList: cardPostList, + isCard: isCard, + deliveryNum: deliveryNum }) this.getCodeImg() }) @@ -377,12 +407,35 @@ getInfo () { } else { res.data.is_all_confirm = false; } - + // 权益卡 + let cardPostList = []; + let isCard= false; + let deliveryNum = 0; + if (res.data.order_product_list.some(v=>v.order_card_product)) { + cardPostList = res.data.order_product_list.slice(1) + res.data.order_product_list = [res.data.order_product_list[0]] + isCard = true; + cardPostList.forEach(v=>{ + console.log(v) + if (v.order_card_product) { + v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1 + v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10) + v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10) + } + if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) { + deliveryNum += 1 + } + }) + } + console.log(res.data, 'aaa') this.setData({ isRefund:state.indexOf("REFUND")!=-1, info:res.data, product_model:res.data.order_product_list[0].product_model, - ids: proId.join(",") + ids: proId.join(","), + cardPostList: cardPostList, + isCard: isCard, + deliveryNum: deliveryNum }) this.getCodeImg() }) diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml index e7e887a..563d837 100644 --- a/pages/user/order/postOrderInfo/index.wxml +++ b/pages/user/order/postOrderInfo/index.wxml @@ -120,6 +120,57 @@ + + + + 物流信息 + {{item.showMore?"收起":"展开"}} + + + + 当前已发：{{deliveryNum}} + + + 当前待发：{{cardPostList.length - deliveryNum}} + + + + + + + + + + + {{shipment.order_card_product.month}}月 + + + + + {{shipment.sku_name}} + {{shipment.state_text}} + + + + 快递公司：{{shipment.post_detail_list[0].express_name}} + + + 快递单号： + + {{shipment.post_detail_list[0].courier_number}} 复制 + + + + + + 发货时间：{{shipment.order_card_product.delivery_start_date}} 至 {{shipment.order_card_product.delivery_end_date}} + + + + + + + @@ -169,6 +220,8 @@ 退款详情 确认收货 + 确认收货 + 申请退款 取消订单 去评价 diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss index 6d3e75b..e02e564 100644 --- a/pages/user/order/postOrderInfo/index.wxss +++ b/pages/user/order/postOrderInfo/index.wxss @@ -371,11 +371,72 @@ color: #333333; width: fit-content; margin: 0 auto; box-sizing: border-box; - margin-top: 20rpx; } .expand-tip{ position: absolute; color: #0B898E; right: 0; bottom: 0; +} + +.line-card{ + + width: 90rpx; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + font-weight: bold; + font-size: 23rpx; + color: #999999; + position: relative; + /* height: 100%; */ +} +.line-card .line-dot{ + width: 33rpx; + height: 33rpx; + background: #CCCCCC; + border-radius: 50%; + position: absolute; + left: -16.5rpx; + top: calc(50% - 16.5rpx); + z-index: 3; +} +.first-line{ + height: 50%; + position: absolute; + top: 0; + width: 4rpx; + left: -2rpx; + z-index: 2; + background: white; + z-index: 2; +} +.last-line{ + height: 50%; + position: absolute; + bottom: 0; + width: 4rpx; + left: -2rpx; + z-index: 2; + background: white; + z-index: 2; +} +.my-shipment-place{ + box-sizing: border-box; + margin-left: 20rpx; + border-left: 1px solid #ccc; + padding-bottom: 20rpx; +} +.my-shipment-place:last-of-type{ + + padding-bottom: 0rpx; +} +.completed{ + color: #0b898e; +} +.line-dot image{ + width: 100%; + height: 100%; + border-radius: 50%; } \ No newline at end of file diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index acd1c1b..8d5d702 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -85,9 +85,9 @@ - + - 手机号： {{item.phone}} + 手机号： {{item.phone || item.reserve_mobile}} @@ -122,8 +122,6 @@ - - diff --git a/pages/user/service/info/index.json b/pages/user/service/info/index.json index 35cf02f..d1688bb 100644 --- a/pages/user/service/info/index.json +++ b/pages/user/service/info/index.json @@ -1,5 +1,6 @@ { "usingComponents": { - "title":"/pages/component/TitleHeader" + "title":"/pages/component/TitleHeader", + "kefuCom": "/pages/component/kefu" } } \ No newline at end of file diff --git a/pages/user/service/info/index.wxml b/pages/user/service/info/index.wxml index 4de9a47..cc678e9 100644 --- a/pages/user/service/info/index.wxml +++ b/pages/user/service/info/index.wxml @@ -21,7 +21,7 @@ - + + + \ No newline at end of file diff --git a/pages/user/service/list/index.js b/pages/user/service/list/index.js index b9eedb9..f83638e 100644 --- a/pages/user/service/list/index.js +++ b/pages/user/service/list/index.js @@ -14,8 +14,7 @@ Page({ page_no:1, keyword:"", showModal: false, - // 成功 - ses:true, + }, diff --git a/pages/user/service/list/index.json b/pages/user/service/list/index.json index 35cf02f..d1688bb 100644 --- a/pages/user/service/list/index.json +++ b/pages/user/service/list/index.json @@ -1,5 +1,6 @@ { "usingComponents": { - "title":"/pages/component/TitleHeader" + "title":"/pages/component/TitleHeader", + "kefuCom": "/pages/component/kefu" } } \ No newline at end of file diff --git a/pages/user/service/list/index.wxml b/pages/user/service/list/index.wxml index 1081b19..2b3adbc 100644 --- a/pages/user/service/list/index.wxml +++ b/pages/user/service/list/index.wxml @@ -12,27 +12,6 @@ 没找到想要的答案？一键呼唤人工客服 - - - - - 即将跳转人工在线客服 - 客服服务时间:9:00-12:00, - 13:00-18:00 -如遇紧急情况可拨打 0512-66555111 18915532527 - - 取消 - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/user/user.json b/pages/user/user.json index 8835af0..9157b74 100644 --- a/pages/user/user.json +++ b/pages/user/user.json @@ -1,3 +1,5 @@ { - "usingComponents": {} + "usingComponents": { + "kefuCom": "/pages/component/kefu" + } } \ No newline at end of file diff --git a/pages/user/user.wxml b/pages/user/user.wxml index 94f9bdb..7437bc7 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -131,7 +131,7 @@ 备案号：苏ICP备19064944号-3X@君到苏州 - + + \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index bd11fff..3255440 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -7,25 +7,11 @@ "miniprogram": { "list": [ { - "name": "pages/info/postProductInfo/index", - "pathName": "pages/info/foodProductInfo/index", - "query": "id=464484", + "name": "subPackages/foodListNew/index", + "pathName": "subPackages/foodListNew/index", + "query": "", "scene": null, "launchMode": "default" - }, - { - "name": "pages/activity/huawei/index", - "pathName": "pages/activity/huawei/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/info/roadInfo/index", - "pathName": "pages/list/foodNew/index", - "query": "", - "launchMode": "default", - "scene": null } ] } diff --git a/pages/list/foodNew/index.js b/subPackages/foodListNew/index.js similarity index 93% rename from pages/list/foodNew/index.js rename to subPackages/foodListNew/index.js index 0f66bfa..dd5a222 100644 --- a/pages/list/foodNew/index.js +++ b/subPackages/foodListNew/index.js @@ -1,6 +1,6 @@ // pages/list/theatre/index.js -import commonApi from "../../../utils/https/common" -import util from "../../../utils/util" +import commonApi from "../../utils/https/common" +import util from "../../utils/util" let app = getApp() Page({ @@ -10,13 +10,13 @@ Page({ data: { list:[], tagList: [ - {id: 9, name: "品苏式面"}, - {id: 10, name: "尝农家乐"}, + {id: 521, name: "品苏式面"}, + {id: 522, name: "尝农家乐"}, // {id: 11, name: "鉴苏帮菜"}, // {id: 12, name: "寻夜食堂"}, ], // 父标签477 total:1, - type:9, + type:521, areas: [], areaIndex:0, @@ -81,7 +81,7 @@ Page({ // } // },1) wx.navigateTo({ - url: '/pages/info/foodNew/index?id='+item.id, + url: '/subPackages/foodNew/index?id='+item.id, }) }, getList:function(){ diff --git a/pages/list/foodNew/index.json b/subPackages/foodListNew/index.json similarity index 100% rename from pages/list/foodNew/index.json rename to subPackages/foodListNew/index.json diff --git a/pages/list/foodNew/index.wxml b/subPackages/foodListNew/index.wxml similarity index 97% rename from pages/list/foodNew/index.wxml rename to subPackages/foodListNew/index.wxml index d877f08..840716d 100644 --- a/pages/list/foodNew/index.wxml +++ b/subPackages/foodListNew/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/pages/list/foodNew/index.wxss b/subPackages/foodListNew/index.wxss similarity index 100% rename from pages/list/foodNew/index.wxss rename to subPackages/foodListNew/index.wxss diff --git a/pages/info/foodNew/index.js b/subPackages/foodNew/index.js similarity index 97% rename from pages/info/foodNew/index.js rename to subPackages/foodNew/index.js index 0e38492..75f2b02 100644 --- a/pages/info/foodNew/index.js +++ b/subPackages/foodNew/index.js @@ -1,9 +1,9 @@ // pages/info/roadInfo/index.js let device = wx.getSystemInfoSync(); const ratio = device.windowWidth / 750; -import commonApi from "../../../utils/https/common" -import QRCode from '../../../utils/weapp-qrcode.js' -import {pagePoint, gotoDetail} from '../../../utils/util' +import commonApi from "../../utils/https/common" +import QRCode from '../../utils/weapp-qrcode.js' +import {pagePoint, gotoDetail} from '../../utils/util' let app = getApp() Page({ @@ -50,6 +50,7 @@ Page({ lat: null, scrollLeft: 0, windowWidth: 375, + prod_phone: "", }, /** @@ -64,12 +65,12 @@ Page({ let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight; this.setData({top: height,id: options.id}) // 获取购物车按钮的位置 - // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) { - // console.log(res) - // that.setData({ - // cartTop: res.top - // }) - // }).exec() + wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) { + console.log(res) + that.setData({ + cartTop: res.top + }) + }).exec() if (options.ZTPoint) { this.setData({ ZTPoint: options.ZTPoint @@ -153,7 +154,6 @@ Page({ if (resData.parameter_tag) { resData.parameter_tag_str = resData.parameter_tag.split(',').join(' | ') } - if (resData.supplier_headimg) { resData.supplier_headimg = that.showImg(resData.supplier_headimg) } @@ -168,6 +168,7 @@ Page({ info: resData, // swiperRange: swiperRange, shareImg: null, + prod_phone: resData.scene_tel }) this.drawImg() @@ -492,7 +493,7 @@ Page({ let promise3 = new Promise(function (resolve, reject) { let userid = wx.getStorageSync('jstrip_userid') new QRCode('myQrcode', { - text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1', + text: 'https://m.cloud.sz-trip.com/FoodShopDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1', width: 500, height: 500, padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0 @@ -685,7 +686,7 @@ Page({ callPhone :function () { wx.makePhoneCall({ - phoneNumber: this.data.supplierInfo.phone, + phoneNumber: this.data.prod_phone, }) }, diff --git a/pages/info/foodNew/index.json b/subPackages/foodNew/index.json similarity index 57% rename from pages/info/foodNew/index.json rename to subPackages/foodNew/index.json index ab4ec76..2e64977 100644 --- a/pages/info/foodNew/index.json +++ b/subPackages/foodNew/index.json @@ -1,7 +1,6 @@ { "usingComponents": { "title":"/pages/component/TitleHeader", - "code":"../../order/components/wxqrCode/index" - + "code":"/pages/order/components/wxqrCode/index" } } \ No newline at end of file diff --git a/pages/info/foodNew/index.wxml b/subPackages/foodNew/index.wxml similarity index 96% rename from pages/info/foodNew/index.wxml rename to subPackages/foodNew/index.wxml index 3feb5be..81a0aef 100644 --- a/pages/info/foodNew/index.wxml +++ b/subPackages/foodNew/index.wxml @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ {{supplierInfo.shop_name}} - + {{supplierInfo.address}} @@ -29,7 +29,7 @@ - + - - 立即购买 + 加入购物车 + 立即购买 该商品已下架 - + diff --git a/pages/info/foodNew/index.wxss b/subPackages/foodNew/index.wxss similarity index 100% rename from pages/info/foodNew/index.wxss rename to subPackages/foodNew/index.wxss diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js index 6d4ea30..5f410db 100644 --- a/subPackages/gwcOrder/index.js +++ b/subPackages/gwcOrder/index.js @@ -57,7 +57,7 @@ Page({ ticket_type:app.globalData.product.sku.ticket_type || 1, isCar:options.isCar, is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard, - is_authentication:app.globalData.product.sku.sku_model.is_authentication, + is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0, is_real_name:app.globalData.product.sku.sku_model.is_real_name, }) console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard); @@ -396,6 +396,9 @@ Page({ remark: remark, product_num: app.globalData.product.isGroup == 1 ? 1 : productNum, phone:this.data.phone,// 不实名的时候传的手机号参数 + // 美食类型 + reserve_mobile: product.product.type=='food'?this.data.phone:"", + }], originate_order_id: this.data.kjId, gp_id: app.globalData.gp_id, @@ -427,7 +430,7 @@ Page({ if(app.globalData.list){ app.globalData.list[app.globalData.index] = this.data.product // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList - if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) { + if (!app.globalData.list[app.globalData.index].sku.sku_model.is_authentication) { app.globalData.list[app.globalData.index].phone = this.data.phone app.globalData.list[app.globalData.index].linkmanList = [] }else { diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml index c28d857..6d08452 100644 --- a/subPackages/gwcOrder/index.wxml +++ b/subPackages/gwcOrder/index.wxml @@ -15,13 +15,14 @@ - {{product && product.isGroup!=1?'购票数量':'预约人数'}} + {{product && product.isGroup!=1?'数量':'预约人数'}} {{productNum}} - + @@ -63,7 +64,7 @@ {{product.product.title}}-{{product.sku.sku_name}} - 出行人信息 + {{product.product.type=="food"?'预定人信息':'出行人信息'}} diff --git a/utils/util.js b/utils/util.js index 35b9226..ae04163 100644 --- a/utils/util.js +++ b/utils/util.js @@ -386,12 +386,21 @@ const orderMoreTime = function(item){ } } const gotoOrder = function(item){ + + // 数量超过两个 购物车下单 跳H5 (小程序二维码没分开) + if (item.order_product_list.length>1) { + wx.navigateTo({ + url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id), + }) + return; + } if(item.order_product_list[0].product_model=='ticket'){ wx.navigateTo({ url: '/pages/user/order/sceneOrderInfo/index?id='+item.order_id, }) return; } + if(item.order_product_list[0].product_model=='food'){ wx.navigateTo({ url: '/pages/user/order/foodOrderInfo/index?id='+item.order_id,