From 64a6295fda7134ea6883e30bb5aea0dd5b5e002f Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Thu, 27 Jun 2024 20:04:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 12 +- manifest.json | 10 +- my/hongbao/youhuijuan.vue | 3 + my/hongbao/youhuijuanList.vue | 84 +- my/order/pay.vue | 45 +- my/order/payModify.vue | 176 +- my/order/payModifyDd.vue | 1985 ++++++++++++++++ my/order/payModifyTc.vue | 2016 +++++++++++++++++ my/order/payding.vue | 1956 ++++++++++++++++ my/order/paydingDd.vue | 1956 ++++++++++++++++ my/order/paydingTc.vue | 1820 +++++++++++++++ my/vip/index.vue | 2 +- pages.json | 41 +- pages/index/index.vue | 22 +- pages/my/fuwuDateil.vue | 2 +- pages/my/index.vue | 13 +- pages/my/indextaociliaoList.vue | 2 +- pages/my/serviceOderDrtail.vue | 27 +- pages/order/index.vue | 33 +- pages/therapist/therapist.vue | 10 +- pages/therapist/therapistDingdan.vue | 2 +- uni_modules/uni-number-box/changelog.md | 39 + .../uni-number-box/uni-number-box.vue | 232 ++ uni_modules/uni-number-box/package.json | 83 + uni_modules/uni-number-box/readme.md | 13 + uview-ui/libs/request/index.js | 4 +- 26 files changed, 10433 insertions(+), 155 deletions(-) create mode 100644 my/order/payModifyDd.vue create mode 100644 my/order/payModifyTc.vue create mode 100644 my/order/payding.vue create mode 100644 my/order/paydingDd.vue create mode 100644 my/order/paydingTc.vue create mode 100644 uni_modules/uni-number-box/changelog.md create mode 100644 uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue create mode 100644 uni_modules/uni-number-box/package.json create mode 100644 uni_modules/uni-number-box/readme.md diff --git a/index.html b/index.html index 6f06fa4..11e8221 100644 --- a/index.html +++ b/index.html @@ -21,14 +21,16 @@ window._AMapSecurityConfig = { //securityJsCode: "js秘钥", // serviceHost: 'https://wx.sjajk.com/_AMapService', - serviceHost: 'http://120.46.52.165/_AMapService', + serviceHost: 'http://sauser.blxinchuang.com/_AMapService' + // serviceHost: 'http://120.46.52.165/_AMapService', // serviceHost: 'http://192.168.2.222:8187/_AMapService', }; - - + + + diff --git a/manifest.json b/manifest.json index 5adc8de..3d05b91 100644 --- a/manifest.json +++ b/manifest.json @@ -170,7 +170,7 @@ "proxy" : { // 可代理多个 "/TencentGet" : { - "target" : "https://apis.map.qq.com/ws/geocoder/v1/", // 腾讯地图逆地址解析 + "target" : "http://sauser.blxinchuang.com/", // 腾讯地图逆地址解析 "changeOrigin" : true, "secure" : false, "pathRewrite" : { @@ -182,14 +182,14 @@ "sdkConfigs" : { "maps" : { "amap" : { - "key" : "2acf1b8c3d1aaf0070472dec19018d96", - "securityJsCode" : "2b07c8496878c327a8ae7a19de33e2a7", - "serviceHost" : "http://192.168.2.222:8187/_AMapService" + "key" : "32c22db939160ba44394eb187f7897ae", + "securityJsCode" : "260614bdf77a5961d4379530363dc5c0", + "serviceHost" : "http://sauser.blxinchuang.com/_AMapService" } } }, // "serviceHost" : "http://192.168.2.222:8187/_AMapService" - // "serviceHost" : "http://47.75.182.93:8090/_AMapService" + // "serviceHost" : "http://120.46.52.165/_AMapService" "template" : "index.html" } } diff --git a/my/hongbao/youhuijuan.vue b/my/hongbao/youhuijuan.vue index 7e4a60e..5900866 100644 --- a/my/hongbao/youhuijuan.vue +++ b/my/hongbao/youhuijuan.vue @@ -158,6 +158,9 @@ \ No newline at end of file diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue new file mode 100644 index 0000000..86b5f5f --- /dev/null +++ b/my/order/payModifyTc.vue @@ -0,0 +1,2016 @@ + + + + + \ No newline at end of file diff --git a/my/order/payding.vue b/my/order/payding.vue new file mode 100644 index 0000000..c0485fe --- /dev/null +++ b/my/order/payding.vue @@ -0,0 +1,1956 @@ + + + + + \ No newline at end of file diff --git a/my/order/paydingDd.vue b/my/order/paydingDd.vue new file mode 100644 index 0000000..c0485fe --- /dev/null +++ b/my/order/paydingDd.vue @@ -0,0 +1,1956 @@ + + + + + \ No newline at end of file diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue new file mode 100644 index 0000000..987055f --- /dev/null +++ b/my/order/paydingTc.vue @@ -0,0 +1,1820 @@ + + + + + \ No newline at end of file diff --git a/my/vip/index.vue b/my/vip/index.vue index 67ee277..0c26476 100644 --- a/my/vip/index.vue +++ b/my/vip/index.vue @@ -161,7 +161,7 @@ this.getIsVip() this.vipData=this.$queue.getData('isVIP') console.log("isVIP------------------->",this.vipData) - if(this.vipData.isVip=='1'){ + if(this.vipData=='1'){ this.vipShow=true; }else{ this.vipData=[] diff --git a/pages.json b/pages.json index 1678d18..83120c6 100644 --- a/pages.json +++ b/pages.json @@ -429,6 +429,7 @@ "navigationBarTitleText": "注册" } }, + // #ifdef H5 { "path": "pages/order/index", @@ -454,7 +455,7 @@ "path": "pages/therapist/therapist", "style": { "navigationBarTitleText": "理疗师", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "app-plus": { "titleNView": false } @@ -466,7 +467,7 @@ "path": "pages/therapist/therapist", "style": { "navigationBarTitleText": "理疗师", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "app-plus": { "titleNView": false } @@ -484,7 +485,7 @@ "path": "pages/therapist/orderDetail", "style": { "navigationBarTitleText": "理疗师详情", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "app-plus": { "titleNView": false } @@ -510,6 +511,30 @@ "titleNView": false } } + }, { + "path": "order/paydingDd", + "style": { + "navigationBarTitleText": "订单支付", + "enablePullDownRefresh": false + } + },{ + "path": "order/payModifyDd", + "style": { + "navigationBarTitleText": "订单页面详情", + "enablePullDownRefresh": false + } + },{ + "path": "order/paydingTc", + "style": { + "navigationBarTitleText": "套餐订单详情", + "enablePullDownRefresh": false + } + }, { + "path": "order/payModifyTc", + "style": { + "navigationBarTitleText": "套餐订单", + "enablePullDownRefresh": false + } }, { "path": "order/payModifyDzhifu", "style": { @@ -702,6 +727,16 @@ } } }, + { + "path": "order/payding", + "style": { + "navigationBarTitleText": "项目订单详情", + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, { "path": "order/payModify", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 225a07e..db30ad1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,6 +4,9 @@ 盛安到家 + --{{latitude}}-- + --{{longitude}}-- + --{{cuowu}}-- 实名认证 @@ -323,6 +326,7 @@ txAppKey: '', tpSel: 0, tpCount: 0, + cuowu:'' } }, onShareAppMessage(res) { //发送给朋友 @@ -421,7 +425,9 @@ }); // #endif }, - fail: function() { + fail: function(e) { + this.cuowu=e + console.log("获取信息失败,请重试!",e) // #ifdef APP-PLUS that.checkPermission(); // #endif @@ -443,7 +449,7 @@ } // #endif this.city = uni.getStorageSync('city') - console.log(this.city) + this.getIsVip() this.getKTCityList(); this.getHomeArtificerList(); this.latitude = uni.getStorageSync('latitude') @@ -483,6 +489,18 @@ // } }, methods: { + getIsVip() { + this.$Request.get("/app/UserVip/selectUserVip").then(res => { + if (res.code == 0) { + // this.isVip = res.data + if(res.data==undefined){ + this.$queue.setData('isVIP','0') + }else{ + this.$queue.setData('isVIP','1') + } + } + }); + }, goChat() { let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 let kefuPhone = this.$queue.getData('kefuPhone'); diff --git a/pages/my/fuwuDateil.vue b/pages/my/fuwuDateil.vue index 8afbeba..5953c8d 100644 --- a/pages/my/fuwuDateil.vue +++ b/pages/my/fuwuDateil.vue @@ -129,7 +129,7 @@ this.$queue.setData('ordersId',this.dataList.id); this.$queue.setData('daibudan',''); this.$queue.setData('youhui',''); - this.$queue.setData('classifyId',item.classifyId) + this.$queue.setData('xiangmu',item) uni.navigateTo({ url:'/my/order/payModify?ordersId='+this.dataList.id }) diff --git a/pages/my/index.vue b/pages/my/index.vue index 0bf207f..d8dce75 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -131,7 +131,8 @@ {urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/pages/my/historyMy'}, {urlImg:'../../static/my-gong-9.png',text:'我的团队',link:'/pages/my/myteam'}, ], - token:'' + token:'', + vipData:[] } }, onLoad(e) { @@ -152,6 +153,8 @@ this.getAmount() this.getIsVip() + + } else { this.isShop = 0; this.isAgency = 0; @@ -428,10 +431,14 @@ }, getIsVip() { - this.$Request.get("/app/UserVip/isUserVip").then(res => { + this.$Request.get("/app/UserVip/selectUserVip").then(res => { if (res.code == 0) { this.isVip = res.data - this.$queue.setData('isVIP',this.isVip) + if(this.isVip==undefined){ + this.$queue.setData('isVIP','0') + }else{ + this.$queue.setData('isVIP','1') + } } }); }, diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue index 7d097c7..51a65fc 100644 --- a/pages/my/indextaociliaoList.vue +++ b/pages/my/indextaociliaoList.vue @@ -40,7 +40,7 @@ {{item.oldPrice}} - 查看 + 购买 diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue index c4a13c7..2399706 100644 --- a/pages/my/serviceOderDrtail.vue +++ b/pages/my/serviceOderDrtail.vue @@ -42,15 +42,15 @@ 服务保障 - 持证上岗 + 实名认证 - 收费透明 + 资质认证 - 爽约包赔 + 平台担保 @@ -87,7 +87,7 @@ - + + + 立即购买 @@ -257,9 +257,16 @@ }); }, - openpay() { - this.goOrder() - this.showpay = true + openpay(item) { + this.$queue.setData('mainData',item) + this.$queue.setData('detailData',this.detailData) + this.$queue.setData('xiangmu',item) + this.$queue.setData('youhui',''); + uni.navigateTo({ + url:'/my/order/payModifyTc?ordersId='+item.id + }) + // this.goOrder() + // this.showpay = true }, //支付选择 selectWay: function(item) { diff --git a/pages/order/index.vue b/pages/order/index.vue index ee49c15..c46c45e 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -19,16 +19,17 @@ {{item.artificerName}} - 202312061140172215待付款 - 202312061140172215待服务 - 202312061140172215待评价 - 已取消 - 202312061140172215已完成 - 202312061140172215服务中 - 202312061140172215技师出发 - 202312061140172215技师到达 - 202312061140172215待确认 - 202312061140172215待补单 + {{item.ordersNo}}待付款 + {{item.ordersNo}}待服务 + {{item.ordersNo}}待评价 + {{item.ordersNo}}已取消 + {{item.ordersNo}}已完成 + {{item.ordersNo}}服务中 + {{item.ordersNo}}技师出发 + {{item.ordersNo}}技师到达 + {{item.ordersNo}}待确认 + {{item.ordersNo}}待补单 + {{item.ordersNo}}临时挂单 @@ -63,23 +64,23 @@ 更多 + @click="goNav('/my/order/payModifyDd?ordersId='+item.ordersId,item)" class="btns"> 立即预约 待评价 - - 拒单确认 + 拒单详情 去支付 - 修改订单 @@ -313,7 +314,7 @@ }, methods: { goNav(url,item) { - this.$queue.setData('daibudan',item); + this.$queue.setData('xiangmu',item); uni.navigateTo({ url:url }) @@ -344,6 +345,7 @@ uni.showToast({ title:'操作完成!' }) + this.getOrderList() this.$refs.popupQ.close(typeTxte); }else{ uni.showToast({ @@ -387,6 +389,7 @@ uni.showToast({ title:'操作完成!' }) + that.getOrderList() that.$refs.popup.close(type); }else{ console.log('shibai:' + longitude); diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue index 7ba6115..58bb6eb 100644 --- a/pages/therapist/therapist.vue +++ b/pages/therapist/therapist.vue @@ -1221,10 +1221,10 @@ import permision from "@/components/permission.js"; this.page = this.page + 1; this.getlist() }, - // onPullDownRefresh: function() { - // this.page = 1; - // this.getlist() - // }, + onPullDownRefresh: function() { + this.page = 1; + this.getlist() + }, } @@ -1518,7 +1518,7 @@ import permision from "@/components/permission.js"; background-position: center center; background-repeat: no-repeat; background-size: cover; - overflow: auto; + // overflow: auto; } /deep/.u-content{ border-radius: 30px !important; diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue index c1abe83..3883fec 100644 --- a/pages/therapist/therapistDingdan.vue +++ b/pages/therapist/therapistDingdan.vue @@ -1524,7 +1524,7 @@ background-position: center center; background-repeat: no-repeat; background-size: cover; - overflow: auto; + // overflow: auto; } /deep/.u-content{ border-radius: 30px !important; diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md new file mode 100644 index 0000000..adf9221 --- /dev/null +++ b/uni_modules/uni-number-box/changelog.md @@ -0,0 +1,39 @@ +## 1.2.8(2024-04-26) +- 修复 在vue2下H5黑边的bug +## 1.2.7(2024-04-26) +- 修复 在vue2手动输入后失焦导致清空数值的严重bug +## 1.2.6(2024-02-22) +- 新增 设置宽度属性width(单位:px) +## 1.2.5(2024-02-21) +- 修复 step步长小于1时,键盘类型为number的bug +## 1.2.4(2024-02-02) +- 修复 加减号垂直位置偏移样式问题 +## 1.2.3(2023-05-23) +- 更新示例工程 +## 1.2.2(2023-05-08) +- 修复 change 事件执行顺序错误的问题 +## 1.2.1(2021-11-22) +- 修复 vue3中某些scss变量无法找到的问题 +## 1.2.0(2021-11-19) +- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box) +## 1.1.2(2021-11-09) +- 新增 提供组件设计资源,组件样式调整 +## 1.1.1(2021-07-30) +- 优化 vue3下事件警告的问题 +## 1.1.0(2021-07-13) +- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.7(2021-05-12) +- 新增 组件示例地址 +## 1.0.6(2021-04-20) +- 修复 uni-number-box 浮点数运算不精确的 bug +- 修复 uni-number-box change 事件触发不正确的 bug +- 新增 uni-number-box v-model 双向绑定 +## 1.0.5(2021-02-05) +- 调整为uni_modules目录规范 + +## 1.0.7(2021-02-05) +- 调整为uni_modules目录规范 +- 新增 支持 v-model +- 新增 支持 focus、blur 事件 +- 新增 支持 PC 端 diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue new file mode 100644 index 0000000..4e203cc --- /dev/null +++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue @@ -0,0 +1,232 @@ + + + diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json new file mode 100644 index 0000000..4ac9047 --- /dev/null +++ b/uni_modules/uni-number-box/package.json @@ -0,0 +1,83 @@ +{ + "id": "uni-number-box", + "displayName": "uni-number-box 数字输入框", + "version": "1.2.8", + "description": "NumberBox 带加减按钮的数字输入框组件,用户可以控制每次点击增加的数值,支持小数。", + "keywords": [ + "uni-ui", + "uniui", + "数字输入框" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-number-box/readme.md b/uni_modules/uni-number-box/readme.md new file mode 100644 index 0000000..affc56f --- /dev/null +++ b/uni_modules/uni-number-box/readme.md @@ -0,0 +1,13 @@ + + +## NumberBox 数字输入框 +> **组件名:uni-number-box** +> 代码块: `uNumberBox` + + +带加减按钮的数字输入框。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 + + diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js index e0a53a7..5cc7341 100644 --- a/uview-ui/libs/request/index.js +++ b/uview-ui/libs/request/index.js @@ -102,8 +102,8 @@ class Request { constructor() { this.config = { // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 - // baseUrl: 'http://120.46.52.165/', // 请求的根域名 - baseUrl: 'http://192.168.2.222:8187/', + baseUrl: 'http://120.46.52.165/', // 请求的根域名 + // baseUrl: 'http://192.168.2.222:8187/', // baseUrl: 'http://47.75.182.93:8090/', // 默认的请求头 header: {},