Commit 233bb3873bc91d846d711b71421baca4e603bc1d

Authored by 杨鑫
2 parents 7c305904 00c437f2

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

admin-web-master/src/components/add/addmap.vue
... ... @@ -26,7 +26,7 @@
26 26 </el-form-item> -->
27 27 <el-form-item label="轮播顺序" prop="carouselId" >
28 28 <el-select v-model="formInline.carouselId" placeholder="请选择" style="width: 100%;" @change="handleSelectChange">
29   - <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'+`${item.type==1?'商城端':'商家端'}`" :value="item.id"></el-option>
  29 + <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'+`${item.type==1?'在线商城端':'商家端小程序'}`" :value="item.id"></el-option>
30 30 </el-select>
31 31 </el-form-item>
32 32 <el-form-item label="广告尺寸" prop="dimensions" >
... ...
admin-web-master/src/components/buscha/busCha.vue
... ... @@ -201,7 +201,7 @@
201 201 <div>
202 202 <el-table :data="tableData"
203 203 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
204   - <el-table-column label="商铺名称">
  204 + <el-table-column label="资源名称">
205 205 <template slot-scope="scope">
206 206 {{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
207 207  
... ...
admin-web-master/src/components/chakan/ggsh.vue
... ... @@ -13,8 +13,8 @@
13 13 <allimg v-if="item" :src="item" fit="contain" v-for="item in info.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
14 14 </div>
15 15 </el-form-item>
16   - <el-form-item label="投放内容" prop="adTitle">
17   - <div class="duiqi">{{info.adTitle}}</div>
  16 + <el-form-item label="投放内容" prop="redirectUrl">
  17 + <div class="duiqi">{{info.redirectUrl}}</div>
18 18 </el-form-item>
19 19 </el-form>
20 20 </div>
... ...
admin-web-master/src/utils/request.js
... ... @@ -22,7 +22,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24 24  
25   - baseURL = 'http://128.10.249.9:9003';
  25 + baseURL = 'http://192.168.8.103:9003';
26 26  
27 27  
28 28 } else {
... ...
admin-web-master/src/views/aaa/index.vue
... ... @@ -22,7 +22,8 @@
22 22 </el-table-column> -->
23 23 <el-table-column label="轮播图" prop="" min-width="20%">
24 24 <template slot-scope="scope">
25   - <el-image style="height: 80px;" :src="scope.row.imageUrl" fit="contain"></el-image>
  25 + <el-image style="height: 80px;" :src="scope.row.imageUrl" fit="contain" v-if="scope.row.state !=1"></el-image>
  26 + <el-image style="height: 80px;" src="https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg" fit="contain" v-else></el-image>
26 27 </template>
27 28 </el-table-column>
28 29  
... ... @@ -33,7 +34,7 @@
33 34 </el-table-column>
34 35 <el-table-column label="发布类型" min-width="20%" prop="type" >
35 36 <template slot-scope="scope">
36   - {{ scope.row.type==1?'商城端':'商家端' }}
  37 + {{ scope.row.type==1?'在线商城端':'商家端小程序' }}
37 38 </template>
38 39 </el-table-column>
39 40 <el-table-column label="操作" min-width="17%">
... ... @@ -66,10 +67,10 @@
66 67 <el-form-item label="发布端口" prop="type">
67 68 <el-select v-model="formInline.type" placeholder="请选择" style="width:100%">
68 69 <el-option
69   - label="商城端" :value="1">
  70 + label="在线商城端" :value="1">
70 71 </el-option>
71 72 <el-option
72   - label="商家端" :value="2">
  73 + label="商家端小程序" :value="2">
73 74 </el-option>
74 75 </el-select>
75 76 </el-form-item>
... ... @@ -105,7 +106,7 @@
105 106 data() {
106 107 return {
107 108 currentPage: 1,
108   - total: 100,
  109 + total: 0,
109 110 flag: false,
110 111 pageSize: 10,
111 112 ggXin: false,
... ...
ceres-uniapp-master/components/canvasShow/basics/banner.vue
... ... @@ -44,7 +44,7 @@
44 44 NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => {
45 45 res.data.content.map(item=>{
46 46 if(item.state ==1){
47   - item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
  47 + item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg'
48 48 item.jumpUrl = ''
49 49 }
50 50  
... ...
ceres-uniapp-master/config/api.js
... ... @@ -4,15 +4,15 @@
4 4 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
5 5 // const DOMAIN_PREFIXPING = 'http://128.10.249.9:9003'
6 6 // const DOMAIN_PREFIX = 'http://128.10.249.9:9007'
7   -// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
8   -// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
9   -// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
  7 +const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
  8 +const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
  9 +const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
10 10  
11 11  
12   -const host = `${window.location.protocol}//${window.location.host}`
13   -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
14   -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
15   -const TIAOZHUAN = `${host}/cdwlMall/`
  12 +// const host = `${window.location.protocol}//${window.location.host}`
  13 +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
  14 +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
  15 +// const TIAOZHUAN = `${host}/cdwlMall/`
16 16  
17 17  
18 18  
... ...
lvdao-miniapp/pages.json
... ... @@ -493,6 +493,13 @@
493 493 }
494 494 },
495 495 {
  496 + "path": "weball/shopweb",
  497 + "style": {
  498 + "navigationBarBackgroundColor": "#FFFFFF",
  499 + "navigationBarTitleText": ""
  500 + }
  501 + },
  502 + {
496 503 "path": "tishi/tishi",
497 504 "style": {
498 505 "navigationBarBackgroundColor": "#FFFFFF",
... ...
lvdao-miniapp/pages/details/details.vue
... ... @@ -192,19 +192,17 @@
192 192 </u-row>
193 193 </view>
194 194 </view>
195   - <view class="banner-item position" v-if="tableData.shopName" @click="gomapApp(latitude,longitude)">
  195 + <view class="banner-item position" v-if="tableData.shopName" @click.stop="gomapApp(latitude,longitude)">
196 196 <view class="banner-item-title">位置信息</view>
197   - <view style="margin-top: 16rpx;" @click="gomapApp(latitude,longitude)">
198   - <map style="width: 100%; height: 200rpx;" longitude="104.06730651855469" latitude="30.65681556429287" @click="gomapApp(latitude,longitude)" >
199   - <view class="position-info" @click="gomapApp(latitude,longitude)">
  197 + <view style="margin-top: 16rpx;" @click.stop="gomapApp(latitude,longitude)">
  198 + <map style="width: 100%; height: 200rpx;" longitude="104.06730651855469" latitude="30.65681556429287" @click.stop="gomapApp(latitude,longitude)" >
  199 + <view class="position-info" @click.stop="gomapApp(latitude,longitude)">
200 200 <u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
201 201 height="20rpx"></u-image>
202   - <view @click="gomapApp(latitude,longitude)">
  202 + <view @click.stop="gomapApp(latitude,longitude)">
203 203 <text v-if="tableData.shopName">{{tableData.detailedLocation}}</text>
204 204 <u-parse :html="tableData.description" v-else></u-parse>
205 205 </view>
206   -
207   -
208 206 </view>
209 207 </map>
210 208 </view>
... ... @@ -280,7 +278,6 @@
280 278  
281 279 let ce = decodeURIComponent(option.item)
282 280 let data = JSON.parse(ce)
283   - console.log(data)
284 281  
285 282 if (data.shopName) {
286 283 this.qianzui = 'sp'
... ...
lvdao-miniapp/pages/home/home.vue
... ... @@ -69,14 +69,14 @@
69 69 <text>租广告</text>
70 70 </view>
71 71 </view>
72   - <!-- <view class="list" @click="wuye">
  72 + <view class="list" @click="wuye">
73 73 <view class="icon">
74 74 <image :src="$imgUrl('/gouwulan.png')"></image>
75 75 </view>
76 76 <view class="title">
77 77 <text>商城</text>
78 78 </view>
79   - </view> -->
  79 + </view>
80 80 <!-- <view class="list" @click="wuye">
81 81 <view class="icon">
82 82 <image :src="$imgUrl('/home4.png')"></image>
... ... @@ -544,7 +544,7 @@
544 544 this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex, 1).then(res => {
545 545 res.data.data.content.map(item=>{
546 546 if(item.state ==1){
547   - item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
  547 + item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/sp/6fcdaf60-9442-4172-8247-9869761aa247-0c5150bb-7419-43e2-a8b0-e57c305eb99b-微信图片_20250110172248.jpg'
548 548 item.jumpUrl = ''
549 549 }
550 550  
... ... @@ -711,11 +711,12 @@
711 711 wuye() {
712 712 if(uni.getStorageSync('user').phone&&uni.getStorageSync('user').phone != ''){
713 713 uni.navigateTo({
714   - url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/?phone=${uni.getStorageSync('user').phone}`
  714 + url: `/pagesA/weball/shopweb?phone=${uni.getStorageSync('user').phone}`
715 715 })
716   - }else{
  716 + }else{
  717 + console.log('2222222')
717 718 uni.navigateTo({
718   - url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
  719 + url: `/pagesA/weball/shopweb?phone="1"`
719 720 })
720 721 }
721 722  
... ...
lvdao-miniapp/pagesA/PunchInAct/PunchInDetails.vue
... ... @@ -6,7 +6,7 @@
6 6 <image :src="imgurl+tableData.imageUrl" style="width: 100%; height: 100vw; border-radius: 10rpx;"></image>
7 7 </view>
8 8 <view class="title" style="margin-top: 20rpx;">{{tableData.title}}</view>
9   - <view style="width: 100%;height: 1px; background-color: #D8D8D8;margin: 20rpx 0 ;"></view>
  9 + <view style="width: 100%;height: 1px; background-color: rgba(#D8D8D8, 0.5);margin: 20rpx 0 ;"></view>
10 10 <view class="title" style="margin-top: 20rpx;display:flex;" >
11 11 <view style="font-size: 12px;padding:2px 8px;border: 1px solid #0FBB59; color: #0FBB59;margin:0 5px; border-radius: 10px;font-weight: 300;" v-for="(item,index) in list">{{item}}</view>
12 12 </view>
... ...
lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue
... ... @@ -3,23 +3,75 @@
3 3 <view class="page-info">
4 4 <view class="info-box">
5 5 <view class="title">参与时间</view>
6   - <radio-group v-model="participateTimeType">
7   - <label class="radio-label" v-for="(item, index) in timeOptions" :key="index">
8   - <radio :value="item.value" :color="item.value === 'sync' ? '#4CD964' : '#C8C9CC'"></radio>
9   - <view class="radio-text">{{ item.label }}</view>
10   - </label>
11   - </radio-group>
  6 + <u-radio-group v-model="participateTimeType" :wrap="true">
  7 + <u-radio
  8 + @change="radioChange"
  9 + v-for="(item, index) in timeOptions" :key="index"
  10 + :name="item.name"
  11 + active-color="#4CD964"
  12 + >
  13 + {{item.name}}
  14 + </u-radio>
  15 +
  16 + </u-radio-group>
  17 + <u-input v-if="participateTimeType=='自定义时间'" style="width: 30%;" v-model="form.canyutiem" type="select" @click="establishow = true"
  18 + placeholder="请选择" />
  19 + <u-picker mode="time" v-model="establishow" :params="params"
  20 + @confirm="establiChange"></u-picker>
12 21 </view>
13 22 <view class="info-box">
14   - <view class="title">奖品设置</view>
15   -
  23 + <view style="display: flex; justify-content: space-between;">
  24 + <view class="title">奖品设置</view>
  25 + <view @click="addjiangli" class="" style="font-size: 14px;color: #0FBB59;font-weight: bold;">添加奖励<u-icon name="play-right-fill" color="#0FBB59" size="23"></u-icon></view>
  26 + </view>
  27 + <view style="width: 100%;height: 1px; background-color: rgba(#D8D8D8, 0.5);margin: 20rpx 0 ;"></view>
  28 + <view>
  29 + <u-table :borde="false">
  30 + <u-tr>
  31 + <u-th>名称</u-th>
  32 + <u-th>奖品</u-th>
  33 + <u-th>数量</u-th>
  34 + </u-tr>
  35 + <u-tr>
  36 + <u-td>浙江大学</u-td>
  37 + <u-td>二年级</u-td>
  38 + <u-td>22</u-td>
  39 + </u-tr>
  40 + <u-tr>
  41 + <u-td>清华大学</u-td>
  42 + <u-td>05班</u-td>
  43 + <u-td>20</u-td>
  44 + </u-tr>
  45 + </u-table>
  46 + </view>
16 47  
17 48 </view>
18 49 <view class="info-box">
19   - <view class="title">规则介绍</view>
20   -
21   -
22   - </view>
  50 + <view style="display: flex; justify-content: space-between;">
  51 + <view class="title">打卡设置</view>
  52 + <view @click="dakaSet" class="" style="font-size: 14px;color: #0FBB59;font-weight: bold;">打卡设置<u-icon name="play-right-fill" color="#0FBB59" size="23"></u-icon></view>
  53 + </view>
  54 + <view style="width: 100%;height: 1px; background-color: rgba(#D8D8D8, 0.5);margin: 20rpx 0 ;"></view>
  55 + <view>
  56 + <u-table :borde="false">
  57 + <u-tr>
  58 + <u-th>打卡点</u-th>
  59 + <u-th>位置</u-th>
  60 + <u-th>奖励</u-th>
  61 + </u-tr>
  62 + <u-tr>
  63 + <u-td>浙江大学</u-td>
  64 + <u-td>二年级</u-td>
  65 + <u-td>22</u-td>
  66 + </u-tr>
  67 + <u-tr>
  68 + <u-td>清华大学</u-td>
  69 + <u-td>05班</u-td>
  70 + <u-td>20</u-td>
  71 + </u-tr>
  72 + </u-table>
  73 + </view>
  74 + </view>
23 75 </view>
24 76  
25 77  
... ... @@ -43,6 +95,57 @@
43 95 </u-form>
44 96 </view>
45 97 </u-popup>
  98 + <u-popup class="userForm" v-model="addjiangliShow" mode="center" border-radius="20" :closeable="false" width="100%">
  99 + <view style="padding: 20rpx;">
  100 + <u-form class="form-box" :model="jlForm" ref="uForm" :label-width="120">
  101 + <view style="padding: 10rpx;">
  102 + <!-- <view class="title">请填写您的报名信息</view> -->
  103 + <view style="font-weight: bold;font-size: 16px;">奖励类型</view>
  104 + <view><u-input v-model="jlForm.type" /></view>
  105 + <view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>名称</view>
  106 + <view><u-input v-model="jlForm.name" /></view>
  107 + <view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>奖品数量</view>
  108 + <view><u-input v-model="jlForm.num" /></view>
  109 + <view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>奖品图片</view>
  110 + <view>
  111 + <u-upload style="display: flex;flex-wrap:wrap" :action="$upload" :auto-upload="false"
  112 + ref="coverImage" :max-count="1" :file-list="fist"
  113 + @on-remove="(response, file, fileList) => removeList(response, file, fileList)"
  114 + @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
  115 + </view>
  116 + <view style="font-weight: bold;font-size: 16px;margin: 5px 0;"><span style="color: red;">*</span>兑奖方式</view>
  117 + <view>
  118 + <u-radio-group v-model="jlForm.fangshi" >
  119 + <u-radio
  120 + @change="radioChange"
  121 + v-for="(item, index) in fangshi" :key="index"
  122 + :name="item.name"
  123 + active-color="#4CD964"
  124 + >
  125 + {{item.name}}
  126 + </u-radio>
  127 + </u-radio-group>
  128 + </view>
  129 + <view style="display: flex;justify-content: space-between;margin-top: 10px;">
  130 + <u-button type="" style="width: 45%;" @click="submit">取消</u-button>
  131 + <u-button type="success" style="width: 45%;" @click="submit">提交</u-button>
  132 + </view>
  133 + </view>
  134 + </u-form>
  135 + </view>
  136 + </u-popup>
  137 + <u-popup class="userForm" v-model="dakaShow" mode="center" border-radius="20" :closeable="true" width="100%">
  138 + <view style="padding: 30rpx;">
  139 + <u-form class="form-box" :model="form" ref="uForm" :label-width="120">
  140 + <view style="padding: 10rpx;">
  141 + <view class="title">请填写您的报名信息</view>
  142 + <u-form-item label="*姓名"><u-input v-model="form.userName" /></u-form-item>
  143 + <u-form-item label="*电话"><u-input v-model="form.userPhone" /></u-form-item>
  144 + <u-button type="success" @click="submit">提交</u-button>
  145 + </view>
  146 + </u-form>
  147 + </view>
  148 + </u-popup>
46 149 <u-toast ref="uToast" />
47 150 </view>
48 151 </template>
... ... @@ -51,19 +154,38 @@
51 154 export default {
52 155 data() {
53 156 return {
  157 + fist: [],
54 158 tableData: {},
55 159 list: ['标签', '标签', '标签'],
56   - participateTimeType: 'sync', // 默认选中同步活动周期
  160 + participateTimeType: '同步活动周期', // 默认选中同步活动周期
57 161 timeOptions: [{
58   - value: 'sync',
59   - label: '同步活动周期'
  162 + disabled: true,
  163 + name: '同步活动周期'
  164 + },
  165 + {
  166 + disabled: false,
  167 + name: '自定义时间'
  168 + }
  169 + ],
  170 + fangshi:[
  171 + {
  172 + disabled: true,
  173 + name: '现场兑换'
60 174 },
61 175 {
62   - value: 'custom',
63   - label: '自定义时间'
  176 + disabled: false,
  177 + name: '邮寄'
64 178 }
65 179 ],
66 180 joinShow: false,
  181 + establishow:false,
  182 + addjiangliShow:false,
  183 + dakaShow:false,
  184 + params: {
  185 + year: true,
  186 + month: true,
  187 + day: true
  188 + },
67 189 form: {
68 190 activityId: '',
69 191 userId: '',
... ... @@ -71,6 +193,14 @@
71 193 createUser: '',
72 194 userName: '',
73 195 userPhone: '',
  196 + canyutiem:''
  197 + },
  198 + jlForm:{
  199 + type:'',
  200 + name:'',
  201 + num:'',
  202 + tu:'',
  203 + fangshi:'',
74 204 },
75 205 pagesize: {
76 206 id: null,
... ... @@ -156,6 +286,64 @@
156 286  
157 287 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
158 288 },
  289 + radioChange(val){
  290 + this.form.canyutiem = ''
  291 + },
  292 + establiChange(val){
  293 + this.form.canyutiem = this.timeChange(val)
  294 + },
  295 + timeChange(val) {
  296 + const {
  297 + year,
  298 + month,
  299 + day,
  300 + } = val;
  301 + return `${year}-${month}-${day}`;
  302 + },
  303 + addjiangli(){
  304 + this.addjiangliShow = true
  305 + },
  306 + dakaSet(){
  307 +
  308 + },
  309 + removeList(e, file, fileList) {
  310 + this.jlForm.tu.splice(e, 1)
  311 + this.fist.splice(e, 1)
  312 + },
  313 + onsuccess1(e, file, fileList, ziduan) {
  314 +
  315 + let index = 0
  316 + if (this.jlForm.tu.length != 0) {
  317 + index = this.jlForm.tu.length
  318 + }
  319 +
  320 + uni.uploadFile({
  321 + url: this.$upload, // 仅为示例,请替换为您的服务器上传接口
  322 + filePath: e[index].url,
  323 + name: 'file', // 后端接收的文件参数名
  324 + formData: {
  325 + filePath: 'xcx', // 其他表单数据
  326 + },
  327 + success: (uploadFileRes) => {
  328 +
  329 +
  330 + this.jlForm.tu.push(this.$img + JSON.parse(uploadFileRes.data).data)
  331 +
  332 + uni.showToast({
  333 + title: '上传成功',
  334 + icon: 'success',
  335 + });
  336 + },
  337 + fail: (err) => {
  338 + console.log('上传失败', this.fist)
  339 +
  340 + uni.showToast({
  341 + title: '上传失败',
  342 + icon: 'none',
  343 + });
  344 + },
  345 + });
  346 + },
159 347 }
160 348 };
161 349 </script>
... ... @@ -264,7 +452,7 @@
264 452 margin: 0 40rpx;
265 453  
266 454 .form-box {
267   - padding: 18rpx 30rpx;
  455 + padding: 0rpx 0rpx;
268 456  
269 457 }
270 458  
... ...
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
... ... @@ -162,7 +162,8 @@
162 162 pageindex: {
163 163 pageNumber: 0,
164 164 pageSize: 100,
165   - contactNumber:''
  165 + contactNumber:'',
  166 + dataStatus:"1"
166 167 },
167 168 ids:'',
168 169 showUp:true
... ...
lvdao-miniapp/pagesA/weball/shopweb.vue 0 → 100644
  1 +<template>
  2 + <view>
  3 + <web-view :src="url"></web-view>
  4 + </view>
  5 +</template>
  6 +
  7 +<script>
  8 + export default {
  9 + data() {
  10 + return {
  11 + url:'https://zhgw-uat.028wlkj.com/cdwlMall/meh5/'
  12 + }
  13 + },
  14 + onLoad(e) {
  15 + if(e.phone !='1') {
  16 + this.url = `https://zhgw-uat.028wlkj.com/cdwlMall/meh5/?phone=${e.phone}`
  17 +
  18 + }
  19 + },
  20 + methods: {
  21 +
  22 + }
  23 + }
  24 +</script>
  25 +
  26 +<style>
  27 +
  28 +</style>
... ...
lvdao-miniapp/utils/request.js
... ... @@ -20,7 +20,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
20 20 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
21 21 // bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url;
22 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23   -
  23 +
24 24 // bases = 'http://128.10.249.9:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
... ...