webapp / GreenwayWeb

Commit 2067568a59137e8c7139a05207b96b87b95b143b

Authored by 杨鑫
1 parent f1b706dd

'租金缴费'

Inline Side-by-side
Showing 23 changed files with 452 additions and 377 deletions
admin-web-master/src/components/add/addremoveht.vue
  View file @2067568
... ... @@ -82,7 +82,7 @@
82 82 <el-col :span="12">
83 83 <el-form-item label="付款日" prop="paymentDay">
84 84 <el-select v-model="formInline.paymentDay" placeholder="请选择" style="width: 100%;">
85   - <el-option :label="val+'号'" :value="val+'号'" v-for="val in 31"></el-option>
  85 + <el-option :label="val+'号'" :value="val+'号'" v-for="val in 31" :key="val"></el-option>
86 86 </el-select>
87 87 </el-form-item>
88 88 </el-col>
... ... @@ -481,7 +481,7 @@
481 481 contractChangeReason: this.contractChangeReason,
482 482 dataStatus: dataStatus,
483 483 originalContractCode: this.info.contractNumber,
484   -
  484 + id: this.info.id,
485 485 relatedMerchants: this.info.relatedMerchants,
486 486 tenantName: this.info.tenantName,
487 487 tenantTelephone: this.info.tenantTelephone,
... ... @@ -492,6 +492,7 @@
492 492 if (valid) {
493 493 cereContractInformation({
494 494 ...this.formInline,
  495 + id: this.info.id,
495 496 relatedMerchants: this.shopId,
496 497 contractChangeReason: this.contractChangeReason,
497 498 dataStatus: dataStatus,
... ...
admin-web-master/src/utils/request.js
  View file @2067568
... ... @@ -17,9 +17,9 @@ let baseURL = &#39;&#39;
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19 19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20   - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
21 21 // baseURL = 'http://172.16.61.125:9003';
22   - // baseURL = 'http://10.0.0.51:9003';
  22 + baseURL = 'http://192.168.2.107:9003';
23 23 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
24 24 // baseURL = 'http://192.168.2.225:9003';
25 25  
... ...
admin-web-master/src/views/order/after/index.vue
  View file @2067568
... ... @@ -52,7 +52,7 @@
52 52 <el-table-column prop="shopCode" label="店铺编码" width="220" />
53 53 <el-table-column prop="number" label="退款商品数量" width="220" />
54 54 <el-table-column prop="refundMoney" label="退款金额（元）" width="220" />
55   - <el-table-column label="操作" show-overflow-tooltip>
  55 + <el-table-column label="操作" show-overflow-tooltip fixed="right">
56 56 <template slot-scope="scope">
57 57 <div class="btnList">
58 58 <div
... ...
admin-web-master/src/views/order/orderany/index.vue
  View file @2067568
... ... @@ -209,6 +209,19 @@
209 209 search(){
210 210 this.getTotalData()
211 211 },
  212 + clear(){
  213 + this.formParams={
  214 + searchType: '1',
  215 + search: '', // 搜索字段
  216 + state: '',
  217 + // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
  218 + dates: [], // 下单时间数组
  219 + page: 1,
  220 + shopName: '',
  221 + pageSize: 10
  222 + }
  223 + this.getTotalData()
  224 + },
212 225 async getTotalData() {
213 226 const res = await orderGetAll(this.formParams)
214 227 const Orderlist = await orderStatistics(res.data.list)
... ...
admin-web-master/src/views/order/ordersel/index.vue
  View file @2067568
... ... @@ -93,7 +93,7 @@
93 93 </template>
94 94 </el-table-column>
95 95  
96   - <el-table-column label="操作" show-overflow-tooltip>
  96 + <el-table-column label="操作" show-overflow-tooltip fixed="right">
97 97 <template slot-scope="scope">
98 98 <div class="btnList">
99 99 <div class="tableBtn greens" @click="seeMore(scope.row)">查看</div>
... ...
admin-web-master/src/views/order/pending/index.vue
  View file @2067568
... ... @@ -92,7 +92,7 @@
92 92 </template>
93 93 </el-table-column>
94 94  
95   - <el-table-column label="操作" show-overflow-tooltip>
  95 + <el-table-column label="操作" show-overflow-tooltip fixed="right">
96 96 <template slot-scope="scope">
97 97 <div class="btnList">
98 98 <div class="tableBtn greens" @click="seeMore(scope.row)">查看</div>
... ...
lvdao-miniapp/App.vue
  View file @2067568
... ... @@ -17,7 +17,7 @@ export default {
17 17 </script>
18 18  
19 19 <style lang="scss">
20   - @import "uview-ui/index.scss";
  20 +@import "uview-ui/index.scss";
21 21 /*每个页面公共css */
22 22 @import 'colorui/main.css';
23 23  
... ...
lvdao-miniapp/manifest.json
  View file @2067568
1 1 {
2   - "name" : "绿道",
3   - "appid" : "__UNI__F034047",
4   - "description" : "",
5   - "versionName" : "1.0.2",
6   - "versionCode" : "100",
7   - "transformPx" : false,
8   - /* 5+App特有相关 */
9   - "app-plus" : {
10   - "usingComponents" : true,
11   - "nvueCompiler" : "uni-app",
12   - "compilerVersion" : 3,
13   - "splashscreen" : {
14   - "alwaysShowBeforeRender" : true,
15   - "waiting" : true,
16   - "autoclose" : true,
17   - "delay" : 0
18   - },
19   - /* 模块配置 */
20   - "modules" : {},
21   - /* 应用发布信息 */
22   - "distribute" : {
23   - /* android打包配置 */
24   - "android" : {
25   - "permissions" : [
26   - "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
27   - "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
28   - "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
29   - "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
30   - "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
31   - "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
32   - "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
33   - "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
34   - "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
35   - "<uses-permission android:name=\"android.permission.CAMERA\"/>",
36   - "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
37   - "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
38   - "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
39   - "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
40   - "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
41   - "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
42   - "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
43   - "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
44   - "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
45   - "<uses-feature android:name=\"android.hardware.camera\"/>",
46   - "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
47   - "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
48   - ]
49   - },
50   - /* ios打包配置 */
51   - "ios" : {},
52   - /* SDK配置 */
53   - "sdkConfigs" : {
54   - "ad" : {}
55   - },
56   - "icons" : {
57   - "android" : {
58   - "hdpi" : "unpackage/res/icons/72x72.png",
59   - "xhdpi" : "unpackage/res/icons/96x96.png",
60   - "xxhdpi" : "unpackage/res/icons/144x144.png",
61   - "xxxhdpi" : "unpackage/res/icons/192x192.png"
62   - },
63   - "ios" : {
64   - "appstore" : "unpackage/res/icons/1024x1024.png",
65   - "ipad" : {
66   - "app" : "unpackage/res/icons/76x76.png",
67   - "app@2x" : "unpackage/res/icons/152x152.png",
68   - "notification" : "unpackage/res/icons/20x20.png",
69   - "notification@2x" : "unpackage/res/icons/40x40.png",
70   - "proapp@2x" : "unpackage/res/icons/167x167.png",
71   - "settings" : "unpackage/res/icons/29x29.png",
72   - "settings@2x" : "unpackage/res/icons/58x58.png",
73   - "spotlight" : "unpackage/res/icons/40x40.png",
74   - "spotlight@2x" : "unpackage/res/icons/80x80.png"
75   - },
76   - "iphone" : {
77   - "app@2x" : "unpackage/res/icons/120x120.png",
78   - "app@3x" : "unpackage/res/icons/180x180.png",
79   - "notification@2x" : "unpackage/res/icons/40x40.png",
80   - "notification@3x" : "unpackage/res/icons/60x60.png",
81   - "settings@2x" : "unpackage/res/icons/58x58.png",
82   - "settings@3x" : "unpackage/res/icons/87x87.png",
83   - "spotlight@2x" : "unpackage/res/icons/80x80.png",
84   - "spotlight@3x" : "unpackage/res/icons/120x120.png"
85   - }
86   - }
87   - },
88   - "splashscreen" : {
89   - "android" : {
90   - "hdpi" : "",
91   - "xhdpi" : "",
92   - "xxhdpi" : ""
93   - },
94   - "androidStyle" : "default"
95   - }
96   - }
97   - },
98   - /* 快应用特有相关 */
99   - "quickapp" : {},
100   - /* 小程序特有相关 */
101   - "mp-weixin" : {
102   - "appid" : "wx005c61919377e6af",
103   - "setting" : {
104   - "urlCheck" : false,
105   - "es6" : true,
106   - "postcss" : false,
107   - "minified" : true
108   - },
109   - "usingComponents" : true,
110   - "permission" : {}
111   - },
112   - "mp-alipay" : {
113   - "usingComponents" : true
114   - },
115   - "mp-baidu" : {
116   - "usingComponents" : true
117   - },
118   - "mp-toutiao" : {
119   - "usingComponents" : true
120   - },
121   - "h5" : {
122   - "router" : {
123   - "mode" : "hash",
124   - "base" : "./"
125   - },
126   - "title" : "商城",
127   - "devServer" : {
128   - "https" : false
129   - },
130   - "domain" : "",
131   - "sdkConfigs" : {
132   - "maps" : {
133   - "qqmap" : {
134   - "key" : "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
135   - }
136   - }
137   - },
138   - "template" : "home.vue"
139   - }
140   -}
  2 + "name": "绿道",
  3 + "appid": "__UNI__F034047",
  4 + "description": "",
  5 + "versionName": "1.0.2",
  6 + "versionCode": "100",
  7 + "transformPx": false,
  8 + /* 5+App特有相关 */
  9 + "app-plus": {
  10 + "usingComponents": true,
  11 + "nvueCompiler": "uni-app",
  12 + "compilerVersion": 3,
  13 + "splashscreen": {
  14 + "alwaysShowBeforeRender": true,
  15 + "waiting": true,
  16 + "autoclose": true,
  17 + "delay": 0
  18 + },
  19 + /* 模块配置 */
  20 + "modules": {},
  21 + /* 应用发布信息 */
  22 + "distribute": {
  23 + /* android打包配置 */
  24 + "android": {
  25 + "permissions": [
  26 + "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
  27 + "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
  28 + "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
  29 + "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
  30 + "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
  31 + "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
  32 + "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
  33 + "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
  34 + "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
  35 + "<uses-permission android:name=\"android.permission.CAMERA\"/>",
  36 + "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
  37 + "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
  38 + "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
  39 + "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
  40 + "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
  41 + "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
  42 + "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
  43 + "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
  44 + "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
  45 + "<uses-feature android:name=\"android.hardware.camera\"/>",
  46 + "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
  47 + "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
  48 + ]
  49 + },
  50 + /* ios打包配置 */
  51 + "ios": {},
  52 + /* SDK配置 */
  53 + "sdkConfigs": {
  54 + "ad": {}
  55 + },
  56 + "icons": {
  57 + "android": {
  58 + "hdpi": "unpackage/res/icons/72x72.png",
  59 + "xhdpi": "unpackage/res/icons/96x96.png",
  60 + "xxhdpi": "unpackage/res/icons/144x144.png",
  61 + "xxxhdpi": "unpackage/res/icons/192x192.png"
  62 + },
  63 + "ios": {
  64 + "appstore": "unpackage/res/icons/1024x1024.png",
  65 + "ipad": {
  66 + "app": "unpackage/res/icons/76x76.png",
  67 + "app@2x": "unpackage/res/icons/152x152.png",
  68 + "notification": "unpackage/res/icons/20x20.png",
  69 + "notification@2x": "unpackage/res/icons/40x40.png",
  70 + "proapp@2x": "unpackage/res/icons/167x167.png",
  71 + "settings": "unpackage/res/icons/29x29.png",
  72 + "settings@2x": "unpackage/res/icons/58x58.png",
  73 + "spotlight": "unpackage/res/icons/40x40.png",
  74 + "spotlight@2x": "unpackage/res/icons/80x80.png"
  75 + },
  76 + "iphone": {
  77 + "app@2x": "unpackage/res/icons/120x120.png",
  78 + "app@3x": "unpackage/res/icons/180x180.png",
  79 + "notification@2x": "unpackage/res/icons/40x40.png",
  80 + "notification@3x": "unpackage/res/icons/60x60.png",
  81 + "settings@2x": "unpackage/res/icons/58x58.png",
  82 + "settings@3x": "unpackage/res/icons/87x87.png",
  83 + "spotlight@2x": "unpackage/res/icons/80x80.png",
  84 + "spotlight@3x": "unpackage/res/icons/120x120.png"
  85 + }
  86 + }
  87 + },
  88 + "splashscreen": {
  89 + "android": {
  90 + "hdpi": "",
  91 + "xhdpi": "",
  92 + "xxhdpi": ""
  93 + },
  94 + "androidStyle": "default"
  95 + }
  96 + }
  97 + },
  98 + /* 快应用特有相关 */
  99 + "quickapp": {},
  100 + /* 小程序特有相关 */
  101 + "mp-weixin": {
  102 + "appid": "wx005c61919377e6af",
  103 + "setting": {
  104 + "urlCheck": false,
  105 + "es6": true,
  106 + "postcss": false,
  107 + "minified": true
  108 + },
  109 + "usingComponents": true,
  110 + "permission": {}
  111 + },
  112 + "mp-alipay": {
  113 + "usingComponents": true
  114 + },
  115 + "mp-baidu": {
  116 + "usingComponents": true
  117 + },
  118 + "mp-toutiao": {
  119 + "usingComponents": true
  120 + },
  121 + "h5": {
  122 + "router": {
  123 + "mode": "hash",
  124 + "base": "./"
  125 + },
  126 + "title": "商城",
  127 + "devServer": {
  128 + "https": false
  129 + },
  130 + "domain": "",
  131 + "sdkConfigs": {
  132 + "maps": {
  133 + "qqmap": {
  134 + "key": "6YVBZ-Z6EC4-JYNUH-FGQKA-G6PAE-JVF3U"
  135 + }
  136 + }
  137 + },
  138 + "template": "home.vue"
  139 + }
  140 +}
141 141 \ No newline at end of file
... ...
lvdao-miniapp/pages/activityAdd/activityAdd.vue
  View file @2067568
... ... @@ -197,13 +197,14 @@
197 197 }
198 198 if(this.typeEdit){
199 199 this.$http.sendRequest('/cereActivityApplication/edit', 'POST',info,1).then(res => {
200   - uni.navigateTo({
  200 + uni.redirectTo({
201 201 url: '/pages/mycreated/mycreated'
202 202 })
203 203 })
204 204 }else{
  205 +
205 206 this.$http.sendRequest('/cereActivityApplication/add', 'POST',info,1).then(res => {
206   - uni.navigateTo({
  207 + uni.redirectTo({
207 208 url: '/pages/mycreated/mycreated'
208 209 })
209 210 }).catch(err => {
... ...
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
  View file @2067568
... ... @@ -129,7 +129,7 @@ export default {
129 129 methods: {
130 130 leaseAdd(url){
131 131  
132   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
  132 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
133 133 if(res.data.code == '20004' || res.data.code == '20003'){
134 134 uni.navigateTo({
135 135 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/details/details.vue
  View file @2067568
... ... @@ -183,7 +183,7 @@ export default {
183 183 },
184 184 methods: {
185 185 leaseAdd(url){
186   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
  186 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
187 187 if(res.data.code == '20004' || res.data.code == '20003'){
188 188 uni.navigateTo({
189 189 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/field/field.vue
  View file @2067568
... ... @@ -107,6 +107,7 @@
107 107 export default {
108 108 data() {
109 109 return {
  110 + $img: this.$root.$img,
110 111 query:{
111 112 venueName:'',
112 113 pageNumber: 0,
... ...
lvdao-miniapp/pages/login/login.vue
  View file @2067568
... ... @@ -110,7 +110,7 @@
110 110 username:this.phone,
111 111 code:this.code
112 112 }
113   - this.$http.sendRequest('/business/login', 'POST', data, 2).then(res => {
  113 + this.$http.sendRequest('/business/login', 'POST', data,2).then(res => {
114 114 if (res.data.code == '' || res.data.code == '200') {
115 115 uni.setStorageSync('token', res.data.data.token);
116 116 uni.setStorageSync('user', res.data.data);
... ...
lvdao-miniapp/pages/message/message.vue
  View file @2067568
... ... @@ -228,7 +228,7 @@
228 228 })
229 229 } else {
230 230  
231   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
  231 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
232 232 if(res.data.code == '20004' || res.data.code == '20003'){
233 233 uni.navigateTo({
234 234 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/my/my.vue
  View file @2067568
... ... @@ -284,7 +284,7 @@
284 284 })
285 285 } else {
286 286  
287   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
  287 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
288 288 if(res.data.code == '20004' || res.data.code == '20003'){
289 289 uni.navigateTo({
290 290 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/mycreated/mycreated.vue
  View file @2067568
... ... @@ -10,7 +10,8 @@
10 10 <u-button type="success" @click="search">搜索</u-button>
11 11 </view> -->
12 12 <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
13   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  13 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}"
  14 + bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
14 15 </view>
15 16 <view class="goods-data">
16 17 <view class="goods-list">
... ... @@ -33,7 +34,7 @@
33 34 </view>
34 35 <view class="info-item">
35 36 <view class="label">活动状态：</view>
36   - <text>{{v.auditStatus =='1'?'待提交':v.auditStatus =='2'?'待审核':v.auditStatus =='3'?'审核通过':v.auditStatus =='4'?'审核驳回':''}}</text>
  37 + <text>{{v.auditStatus =='1'?'待提交':v.auditStatus =='2'?'待审核':v.auditStatus =='3'&&v.activeState==null?'审核通过':v.auditStatus =='3'&&v.activeState==0?'未开始':v.auditStatus =='3'&&v.activeState==1?'进行中':v.auditStatus =='3'&&v.activeState==2?'已结束':v.auditStatus =='4'?'审核驳回':''}}</text>
37 38 </view>
38 39 </view>
39 40 </view>
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @2067568
... ... @@ -178,7 +178,7 @@
178 178 })
179 179 } else {
180 180  
181   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
  181 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
182 182 if(res.data.code == '20004' || res.data.code == '20003'){
183 183 uni.navigateTo({
184 184 url: '/pages/login/login'
... ...
lvdao-miniapp/pagesA/rentPay/goPay.vue
  View file @2067568
... ... @@ -4,7 +4,7 @@
4 4 <view class="msgtitle">您正在成都锦江绿道有限公司支付金额</view>
5 5 <view class="price">
6 6 <u-icon name="rmb" style="font-size: 24rpx;" />
7   - 800
  7 + {{allPay}}
8 8 </view>
9 9 </view>
10 10 <view style="height: 120rpx;"></view>
... ... @@ -18,8 +18,19 @@
18 18 export default {
19 19 data() {
20 20 return {
  21 + receivedMsg:[],
  22 + allPay:0
21 23 }
22 24 },
  25 + onLoad(options) {
  26 + if(options.msg){
  27 + let receivedMsg = JSON.parse(options.msg)
  28 + this.receivedMsg = receivedMsg
  29 + receivedMsg.map(item=>{
  30 + this.allPay += item.paymentAmount
  31 + })
  32 + }
  33 + },
23 34 onShow() {
24 35 const isLogin = uni.getStorageSync('token');
25 36 if (isLogin == '') {
... ... @@ -29,7 +40,7 @@
29 40 })
30 41 } else {
31 42  
32   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
  43 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
33 44 if(res.data.code == '20004' || res.data.code == '20003'){
34 45 uni.navigateTo({
35 46 url: '/pages/login/login'
... ... @@ -41,9 +52,21 @@
41 52 },
42 53 methods: {
43 54 submit(){
44   - uni.navigateTo({
45   - url: '/pagesA/rentPay/webView'
  55 + console.log(this.receivedMsg)
  56 +
  57 + let obj = [{
  58 + orderId:this.receivedMsg[0].tenementOrder,
  59 + money:this.receivedMsg[0].paymentAmount,
  60 + }]
  61 + this.$http.sendRequest('/order/rentAggregatePayment','POST',obj,3).then(res => {
  62 + console.log(JSON.parse(res.data.data).data.codeUrl)
  63 + if(res.data.data){
  64 + uni.navigateTo({
  65 + url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
  66 + })
  67 + }
46 68 })
  69 +
47 70 }
48 71 }
49 72 }
... ...
lvdao-miniapp/pagesA/rentPay/rentPay.vue
  View file @2067568
... ... @@ -2,53 +2,52 @@
2 2 <view class="page">
3 3 <view class="search-box">
4 4 <view>
5   - <u-input v-model="value" type="select" @click="show = true" style="background-color: #fff;" placeholder="-" :border="false"/>
6   - <u-select v-model="show" :list="list1" @confirm="confirm"></u-select>
  5 + <u-input v-model="value" type="select" @click="show = true" style="background-color: #fff;"
  6 + placeholder="-" :border="false" />
  7 + <u-select v-model="show" :list="list1" @confirm="confirm($event)"></u-select>
7 8 </view>
8   -
  9 +
9 10 </view>
10 11 <view class="search-total">
11   - <view class="left">
12   - <view class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />100.00</view>
13   - <view>（当前租金欠费金额)</view>
14   - </view>
15   - <div class="right" @click='toDetail'>
16   - <view>缴费记录 <u-icon name="arrow-right" size="28" /></view>
17   - </div>
18   -
  12 + <view class="left">
  13 + <view class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />{{yingPayAll}}</view>
  14 + <view>（当前租金欠费金额)</view>
  15 + </view>
  16 + <div class="right" @click='toDetail'>
  17 + <view>缴费记录 <u-icon name="arrow-right" size="28" /></view>
  18 + </div>
  19 +
19 20 </view>
20   - <view style="text-align: center;color:#0EBB5A;padding: 30rpx 0;">每月1日为付款日</view>
  21 + <view style="text-align: center;color:#0EBB5A;padding: 30rpx 0;">{{etTimePeriodDesc(payNum,dayMsg)}}为付款日</view>
21 22 <!-- 记录列表 -->
22 23 <view class="record-list">
23 24 <view class="record-list-box" v-for="(item,index) in recordList" :key="index">
24   - <u-checkbox-group class="list-group" style="width: 100%;" >
25   - <view class="list">
26   - <u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false" active-color="#0EBB5A" @change="xuanAll(item,$event)"/>
27   -
28   - <view class="list-item">
29   - <view class="list-info">
30   - <view class="info-items">
31   - <view class="info-title">{{item.name}}：</view>
32   - <view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.price}}</view>
33   - </view>
  25 + <u-checkbox-group class="list-group" style="width: 100%;">
  26 + <view class="list">
  27 + <u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false"
  28 + active-color="#0EBB5A" @change="xuanAll(item,$event)" />
  29 +
  30 + <view class="list-item">
  31 + <view class="list-info">
  32 + <view class="info-items">
  33 + <view class="info-title">{{formatTime(payNum,item.tenementOrderDate)}}应缴租金：</view>
  34 + <view class="price"><u-icon name="rmb"
  35 + style="font-size: 24rpx;" />{{item.paymentAmount}}</view>
34 36 </view>
35 37 </view>
36 38 </view>
37   -
  39 + </view>
  40 +
38 41 </u-checkbox-group>
39 42 </view>
40 43 </view>
41 44 <view style="height: 120rpx;"></view>
42 45 <view class="page-footer">
43 46 <view class="footer-buy">
44   - <u-checkbox-group >
45   - <u-checkbox
46   - shape="circle"
47   - @change="quanxuan"
48   - v-model="showAll"
49   - active-color="#0EBB5A"
50   - >全选</u-checkbox>
51   - </u-checkbox-group>
  47 + <u-checkbox-group>
  48 + <u-checkbox shape="circle" @change="quanxuan" v-model="showAll"
  49 + active-color="#0EBB5A">全选</u-checkbox>
  50 + </u-checkbox-group>
52 51 <view class="cart-add">
53 52 合计：<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{payAll}}</view>
54 53 </view>
... ... @@ -57,106 +56,34 @@
57 56 </view>
58 57 <!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> -->
59 58 </view>
60   -
  59 +
61 60 </template>
62 61  
63 62 <script>
64 63 export default {
65 64 data() {
66 65 return {
  66 + payNum: 1,
  67 + dayMsg: '',
67 68 show: false,
68   - payAll:0,
  69 + payAll: 0,
  70 + yingPayAll: 0,
69 71 value: '',
70   - list1: [{ value: '0', label: '全部' },{ value: '1', label: '物业费' }, { value: '2', label: '水费' },{ value: '3', label: '卫生费' }, { value: '4', label: '燃气费' },{ value: '5', label: '电费' } ],
  72 + list1: [],
71 73 checked: [],
72   - recordList:[
73   - {
74   - img: '',
75   - name: '物业费',
76   - price: 1500,
77   - rate: '100%',
78   - chilren: [],
79   - showItem: false,
80   - gouxuan:false
81   - },
82   - {
83   - img: '',
84   - name: '卫生费',
85   - price: 5000,
86   - rate: '100%',
87   - chilren: [],
88   - showItem: false,
89   - gouxuan:false
90   - },
91   - {
92   - img: '',
93   - name: '水费',
94   - price: 2000,
95   - rate: '100%',
96   - chilren: [],
97   - showItem: false,
98   - gouxuan:false
99   - }
100   - ],
101   - recordList1:[
102   - {
103   - img: '',
104   - name: '物业费',
105   - price: 15,
106   - rate: '100%',
107   - chilren: [],
108   - showItem: false,
109   - gouxuan:false
110   - },
111   - {
112   - img: '',
113   - name: '卫生费',
114   - price: 15,
115   - rate: '100%',
116   - chilren: [],
117   - showItem: false,
118   - gouxuan:false
119   - },
120   - {
121   - img: '',
122   - name: '水费',
123   - price: 15,
124   - rate: '100%',
125   - chilren: [],
126   - showItem: false,
127   - gouxuan:false
128   - },
129   - {
130   - img: '',
131   - name: '电费',
132   - price: 15,
133   - rate: '100%',
134   - chilren: [],
135   - showItem: false,
136   - gouxuan:false
137   - },
138   - {
139   - img: '',
140   - name: '燃气费',
141   - price: 15,
142   - rate: '100%',
143   - chilren: [],
144   - showItem: false,
145   - gouxuan:false
146   - },
147   - ],
148   -
149   - loadShow:false,
150   - showAll:false,
151   -
  74 + recordList: [],
  75 + loadShow: false,
  76 + showAll: false,
  77 + ListIndex: 0,
  78 +
152 79 };
153 80 },
154   - watch:{
155   - recordList:{
156   - deep:true,
157   - handler(newVal){
158   - const allTrue = this.recordList.every(item => item.gouxuan)
159   - this.showAll = allTrue
  81 + watch: {
  82 + recordList: {
  83 + deep: true,
  84 + handler(newVal) {
  85 + const allTrue = this.recordList.every(item => item.gouxuan)
  86 + this.showAll = allTrue
160 87 }
161 88 }
162 89 },
... ... @@ -169,89 +96,187 @@
169 96 })
170 97 } else {
171 98  
172   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
173   - if(res.data.code == '20004' || res.data.code == '20003'){
174   - uni.navigateTo({
175   - url: '/pages/login/login'
176   - })
177   - }
  99 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
  100 + pageSize: 10,
  101 + pageNumber: 0,
  102 + phone: uni.getStorageSync('user').phone
  103 + }).then(res => {
  104 +
  105 + if (res.data.code == '20004' || res.data.code == '20003') {
  106 + uni.navigateTo({
  107 + url: '/pages/login/login'
  108 + })
  109 + } else {
  110 +
  111 + this.$http.sendRequest('/cerePropertyOrder/queryByName', 'POST', {
  112 + relatedMerchants: res.data.data.content[0].id
  113 + }, 1).then(res => {
  114 + if (res.data.data.length > 0) {
  115 + const listNew = []
  116 + res.data.data.map((item, index) => {
  117 +
  118 + const newObj = {
  119 + label: item.shopName,
  120 + value: index,
  121 + list: []
  122 + }
  123 + newObj.list = item.cerePropertyOrderList
  124 +
  125 + listNew.push(newObj)
  126 +
  127 + })
  128 +
  129 + this.list1 = listNew
  130 +
  131 + this.value = res.data.data[0].shopName
  132 + this.ListIndex = 0
  133 + const redList = []
  134 + this.payAll = 0
  135 + this.yingPayAll = 0
  136 + res.data.data[0].cerePropertyOrderList.map(item => {
  137 + if (item.payState == 0) {
  138 + this.yingPayAll += item.paymentAmount
  139 + this.payNum = item.payType
  140 + this.dayMsg = item.payDay
  141 + const zujin = {
  142 + ...item,
  143 + showItem: false,
  144 + gouxuan: false,
  145 +
  146 + }
  147 + redList.push(zujin)
  148 + }
  149 + })
  150 + this.recordList = redList
  151 +
  152 +
  153 + }
  154 + })
  155 + }
178 156 })
179 157 }
180 158  
181 159 },
182 160 methods: {
183   - quanxuan(e){
184   -
185   - const allTrue = this.recordList.every(item => item.gouxuan)
186   - if(allTrue){
187   - this.payAll= 0
188   - this.showAll = !this.showAll
189   - this.recordList.forEach(item => {
190   - item.gouxuan = !allTrue;
191   -
192   - });
193   - }else{
194   - this.showAll = true
195   -
196   - this.recordList.forEach(item => {
197   - item.gouxuan = !allTrue;
198   - this.payAll += item.price
199   - });
200   - }
201   -
202   -
  161 + quanxuan(e) {
  162 + this.payAll = 0
  163 + const allTrue = this.recordList.every(item => item.gouxuan)
  164 + if (allTrue) {
  165 + this.showAll = !this.showAll
  166 + this.recordList.forEach(item => {
  167 + item.gouxuan = !allTrue;
  168 + });
  169 + } else {
  170 + this.showAll = true
  171 + this.recordList.forEach(item => {
  172 + item.gouxuan = !allTrue;
  173 + this.payAll += item.paymentAmount
  174 + });
  175 + }
  176 +
  177 +
203 178 },
204   - xuanAll(item,e){
205   -
206   - if(e.value){
207   - this.payAll += item.price
208   - }else{
209   - this.payAll -= item.price
  179 + xuanAll(item, e) {
  180 + if (e.value) {
  181 + this.payAll += item.paymentAmount
  182 + } else {
  183 + this.payAll -= item.paymentAmount
210 184 }
211 185 },
212   - recordXq(item){
213   - const encodedItem = encodeURIComponent(JSON.stringify(item));
  186 + recordXq(item) {
  187 + const encodedItem = encodeURIComponent(JSON.stringify(item))
214 188 uni.navigateTo({
215   - url: `/pages/accepting/accepting?item=${encodedItem}`,
216   - })
  189 + url: `/pages/accepting/accepting?item=${encodedItem}`,
  190 + })
217 191 },
218 192 toDetail() {
  193 + const msg = JSON.stringify(this.list1[this.ListIndex])
219 194 uni.navigateTo({
220   - url: '/pagesA/rentPay/rentPayDetails'
  195 + url: `/pagesA/rentPay/rentPayDetails?msg=${msg}`
221 196 })
222 197 },
223   - joinShow(){
224   - if(this.payAll == 0){
225   - uni.showToast({
226   - icon: 'error',
227   - title: '请选择支付订单'
228   - })
229   - }else{
230   - uni.navigateTo({
231   - url: '/pagesA/rentPay/goPay'
232   - })
233   - }
234   - },
235   - confirm(e){
236   - console.log(e)
237   - let arr =[]
238   - if(e[0].label == '全部'){
239   - this.recordList = this.recordList1
240   - }else{
241   - this.recordList1.map(item =>{
242   - if(item.name == e[0].label){
243   - arr.push(item)
  198 + joinShow() {
  199 + if (this.payAll == 0) {
  200 + uni.showToast({
  201 + icon: 'error',
  202 + title: '请选择支付订单'
  203 + })
  204 + } else {
  205 +
  206 + let payArr = []
  207 + this.recordList.map(item => {
  208 + if (item.gouxuan) {
  209 + payArr.push(item)
244 210 }
245 211 })
246   - this.recordList = arr
  212 + const msg = JSON.stringify(payArr)
  213 + uni.navigateTo({
  214 + url: `/pagesA/rentPay/goPay?msg=${msg}`
  215 + })
247 216 }
  217 + },
  218 + confirm(e) {
  219 +
  220 + let arr = []
248 221 this.value = e[0].label
249   -
  222 + const redList = []
  223 + let index = e[0].value
  224 + this.ListIndex = e[0].value
  225 + this.yingPayAll = 0
  226 + this.payAll = 0
  227 + this.list1[index].list.map(item => {
  228 + this.yingPayAll += item.paymentAmount
  229 + this.payNum = item.payType
  230 + this.dayMsg = item.payDay
  231 + const zujin = {
  232 + ...item,
  233 + showItem: false,
  234 + gouxuan: false,
  235 + }
  236 + redList.push(zujin)
  237 + })
  238 + this.recordList = redList
  239 +
  240 + },
  241 + etTimePeriodDesc(num, day) {
  242 + switch (num) {
  243 + case 1:
  244 + return '每日';
  245 + case 2:
  246 + return `每月${day}`;
  247 + case 3:
  248 + return `每季度${day}`;
  249 + case 4:
  250 + return `每年${day}`;
  251 + default:
  252 + return '';
  253 + }
250 254 },
  255 + formatTime(type, time) {
  256 + // 将传入的时间字符串转换为 Date 对象
  257 + const date = new Date(time);
  258 +
  259 + const day = date.getDate();
  260 + const month = date.getMonth() + 1;
  261 + const quarter = Math.floor((month - 1) / 3) + 1;
  262 + const year = date.getFullYear();
  263 + switch (type) {
  264 + case 1:
  265 + return `${day}号`;
  266 + case 2:
  267 + return `${month}月${day}号`;
  268 + case 3:
  269 + return `${month}月${day}号`;
  270 + case 4:
  271 + return `${year}年`;
  272 + default:
  273 + return time;
  274 + }
  275 + }
251 276 }
252 277 }
253 278 </script>
254 279  
255 280 <style scoped lang="scss">
256 281 @import 'rentPay.scss';
257   -</style>
  282 +</style>
258 283 \ No newline at end of file
... ...
lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
  View file @2067568
... ... @@ -5,22 +5,22 @@
5 5 <view @click="show = true">{{pageIndex.time}}年<u-icon name="arrow-down"></u-icon></view>
6 6 <u-picker v-model="show" mode="time" :params="{year: true}" @confirm="confirm"></u-picker>
7 7 </div>
8   - <div class="right"><view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></div>
  8 + <div class="right"><view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />{{allPay}}</view></div>
9 9 </view>
10 10 <view class="record-list">
11 11 <view class="record-item" v-for="(item, index) in dataList" :key="index" >
12 12 <view class="info-title">
13   - <view class="title">7月</view>
14   - <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></view>
  13 + <view class="title">{{item.tenementOrderDate}}</view>
  14 + <!-- <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{orderPay}}</view></view> -->
15 15 </view>
16   - <view class="info-items" v-for="(v, i) in item.children" :key="i">
  16 + <view class="info-items">
17 17 <view class="info-item">
18   - <view class="left title">支付订单编号</view>
19   - <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />500.00</view></view>
  18 + <view class="left title">{{item.tenementOrder}}</view>
  19 + <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.paymentAmount}}</view></view>
20 20 </view>
21 21 <view class="info-item">
22 22 <view class="left" style="color: #0FBB59;">支付成功</view>
23   - <view class="right" style="color: #8A8A8A;">07.11 15:21</view>
  23 + <view class="right" style="color: #8A8A8A;">{{item.paymentTime}}</view>
24 24 </view>
25 25 </view>
26 26 </view>
... ... @@ -33,12 +33,9 @@
33 33 data() {
34 34 return {
35 35 show: false,
36   - dataList: [
37   - {
38   - children: [{}, {}]
39   - }
40   -
41   - ],
  36 + dataList: [],
  37 + orderPay:0,
  38 + allPay:0,
42 39 pageIndex:{
43 40 time:''
44 41 }
... ... @@ -47,6 +44,19 @@
47 44 onShow() {
48 45 this.pageIndex.time = this.getCurrentYear()
49 46 },
  47 + onLoad(options) {
  48 + if(options.msg){
  49 + this.orderPay = 0
  50 + this.allPay = 0
  51 + let receivedMsg = JSON.parse(options.msg)
  52 +
  53 + receivedMsg.list.map(item=>{
  54 + this.orderPay+=item.paymentAmount
  55 + this.allPay+=item.paymentAmount
  56 + })
  57 + this.dataList = receivedMsg.list
  58 + }
  59 + },
50 60 methods: {
51 61 getCurrentYear() {
52 62 const year = new Date().getFullYear();
... ...
lvdao-miniapp/pagesA/rentPay/webView.vue
  View file @2067568
1 1 <template>
2 2 <view>
3   - <web-view src="https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F"></web-view>
  3 + <web-view :src="url"></web-view>
4 4 </view>
5 5 </template>
6 6  
7 7 <script>
8 8 export default {
9   - props: {
10   - // 定义接收的 prop，类型为 String
11   - url: {
12   - type: String,
13   - required: true
14   - }
15   - },
16   - computed: {
17   - // 使用计算属性确保 url 被正确绑定到 web-view 的 src 属性
18   - webUrl() {
19   - return this.url;
20   - }
  9 + data() {
  10 + return {
  11 + url:'https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F'
  12 + }
  13 + },
  14 +
  15 + onLoad(options) {
  16 + if(options.urls){
  17 + this.url = options.urls
  18 + }
21 19 },
22 20 mounted() {
23 21 // 可选：在组件挂载后进行一些验证或处理
... ...
lvdao-miniapp/utils/request.js
  View file @2067568
... ... @@ -17,23 +17,25 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
17 17 // bases = 'http://172.16.61.125:9003/' + url;
18 18 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
19 19 // bases = 'http://8.130.38.56:8027/admin-server' + url;
20   - bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
  20 + // bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
21 21  
22   - // bases = 'http://10.0.0.51:9003' + url;
  22 + bases = 'http://192.168.2.107:9003' + url;
23 23 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
24 24 // bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
25 25  
26 26  
  27 + }else if(baseUrl == 3){
  28 + bases = 'http://192.168.2.107:9007' + url;
  29 +
27 30 }else{
28 31 // bases = 'http://172.16.61.125:9004/' + url;
29 32 // bases = 'http://172.16.61.48/business-server' + url;
30 33 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
31   - bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
32   -
33   - // bases = 'http://10.0.0.51:9004' + url;
  34 + // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
  35 +
  36 + bases = 'http://192.168.2.107:9004' + url;
34 37 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
35 38 // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
36   -
37 39 }
38 40 var token = uni.getStorageSync('token') || '';
39 41 var shopId = uni.getStorageSync('shopId') || '';
... ...
merchant-web-master/src/utils/request.js
  View file @2067568
... ... @@ -20,8 +20,8 @@ if (host == &#39;172.16.61.48&#39; || host == &#39;172.16.61.49:5173&#39;) {
20 20 }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
21 21 // 其他情况的默认值
22 22 // PREFIX = 'http://8.130.38.56:8027/business-server';
23   - // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
24   - PREFIX = 'http://192.168.2.225:9004';
  23 + PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
  24 + // PREFIX = 'http://192.168.2.225:9004';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ... @@ -40,7 +40,7 @@ const service = axios.create({
40 40 export const uploadUrl = `${baseURL}/file/upload`
41 41 export const WXuploadUrl = `${baseURL}/file/uploadWxMedia` // 直播上传专用
42 42 //export const QYuploadUrl = `${baseURL}/file/uploadQyMedia` // 微信客服上传专用
43   -export const QYuploadUrl = `${baseURL}/file/upload` // 微信客服上传专用
  43 +export const QYuploadUrl = `${baseURL}/file/upload`
44 44  
45 45 // request interceptor
46 46 service.interceptors.request.use(
... ...