diff --git a/config/baseUrl.js b/config/baseUrl.js index 5be196a..2516a4f 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -9,7 +9,7 @@ if (process.env.NODE_ENV === 'development') { baseUrl = "http://192.168.110.100:9100/pb/"; // socketUrl = "ws://8.129.186.35:6001/"; } else if (process.env.NODE_ENV === 'production') { - // 生产环境 + // 生产环境11 baseUrl = "http://59.110.212.44:9100/pb/"; // baseUrl = "ws://twin-ui.com:6001/"; // socketUrl = "ws://twin-ui.com:6001/"; diff --git a/manifest.json b/manifest.json index edb6740..4f681bf 100644 --- a/manifest.json +++ b/manifest.json @@ -32,7 +32,8 @@ "OAuth" : {}, // "Messaging" : {}, 短信权限 "VideoPlayer" : {}, - "Share" : {} + "Share" : {}, + "Camera" : {} }, "distribute" : { "apple" : { @@ -74,7 +75,8 @@ "", "" ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], + "minSdkVersion" : 21 }, "sdkConfigs" : { "ad" : {}, @@ -143,7 +145,8 @@ "nvueLaunchMode" : "fast", "splashscreen" : { "alwaysShowBeforeRender" : false - } + }, + "nativePlugins" : {} }, // 5+App特有相关 "quickapp" : {}, diff --git a/pages.json b/pages.json index 7dc1794..d40c317 100644 --- a/pages.json +++ b/pages.json @@ -288,6 +288,42 @@ } } + ,{ + "path" : "pages/listen/bgMusix", + "style" : + { + "navigationBarTitleText": "背景音乐模式", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/listen/bgMusic", + "style" : + { + "navigationBarTitleText": "背景音乐启用", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/listen/bgMusic", + "style" : + { + "navigationBarTitleText": "背景音乐启用", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/listen/musicbg", + "style" : + { + "navigationBarTitleText": "音乐1", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue index 6635ffc..20b14a8 100644 --- a/pages/bookShop/orderLCont.vue +++ b/pages/bookShop/orderLCont.vue @@ -101,9 +101,32 @@ 取消订单 去支付 + + 评价 + 联系客服 + + + + + 添加评价 + + + + + + + + + + 提交评价 + + + @@ -119,9 +142,25 @@ export default { data() { return { + Pform:{ // 评价表单 + comment:'', + img:[], + }, + imageStyles:{ + width:64, + height:64, + border:{ + color:"#89aa7d", + width:2, + style:'dashed', + radius:'2px' + } + }, + pingjiaShow:false, logisticsData: [], // 快递信息列表 titleStat: '', orderID: 0, + orderSn:null, orderType: '', orderContet: {}, deliverDetails: [{ @@ -133,6 +172,8 @@ onLoad(e) { this.orderID = e.orderId this.orderType = e.orderType + this.orderSn = e.orderSn + console.log(this.orderID,'this.orderID') }, onShow() { this.getOrderList() @@ -141,6 +182,61 @@ ...mapState(['userInfo']), }, methods: { + select(e){ + console.log('选择文件:',e) + }, + upSuccess(e){ + console.log(e) + }, + // 提交评价 + submitPJ(){ + if(this.Pform.comment != ''){ + console.log(this.Pform,'this.Pform') + return false + this.$http + .post('buy/record/comment',{ + 'userid':this.userInfo.id, + 'orderSn': this.orderSn, + //'starLevel':'', + 'comment': this.Pform.comment, + }) + .then(res => { + if (res.code == 0) { + uni.showToast({ + title:'评价成功!', + icon:'success' + }) + this.pingjiaShow = false + this.Pform.comment = '' + } + }) + }else{ + uni.showToast({ + title:'请先输入您的评价内容 !', + icon:'none' + }) + } + }, + // 添加评价 + pingji(){ + this.pingjiaShow = true + }, + // 联系客服 + kefu(){ + uni.showModal({ + title: '提示', + content: '拨打客服热线:022-24142321', + success: function (res) { + if (res.confirm) { + uni.makePhoneCall({ + phoneNumber: '022-24142321' //仅为示例 + }); + } else if (res.cancel) { + + } + } + }) + }, onPageJump(item) { uni.navigateTo({ url: "./deliverDetail?objId=" + item @@ -287,6 +383,114 @@