webapp / GreenwayWeb

Commit fa21ce0f9a3a90cd679e80a94167d010c11e8c3d

Authored by 杨鑫
1 parent b8665d5b

最新更改bug

Inline Side-by-side
Showing 11 changed files with 48 additions and 16 deletions
admin-web-master/src/views/detect/information/index.vue
  View file @fa21ce0
... ... @@ -22,6 +22,15 @@
22 22 <el-form-item label="归属部门" prop="belongingDepartment">
23 23 <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
24 24 </el-form-item>
  25 + <el-form-item label="状态" prop="publishStatus">
  26 + <el-select v-model="pagequery.publishStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
  27 + <el-option label="待发布" value="0"></el-option>
  28 + <el-option label="待审核" value="1"></el-option>
  29 + <el-option label="已发布" value="2"></el-option>
  30 + <el-option label="不通过" value="3"></el-option>
  31 + <el-option label="已租赁" value="4"></el-option>
  32 + </el-select>
  33 + </el-form-item>
25 34 </el-form>
26 35  
27 36 <div>
... ... @@ -169,7 +178,8 @@
169 178 pageNumber: 0,
170 179 pageSize: 10,
171 180 belongingGreenwaySection:'',
172   - belongingDepartment:''
  181 + belongingDepartment:'',
  182 + publishStatus:''
173 183 },
174 184 tableData: [],
175 185 total: 0,
... ... @@ -368,7 +378,8 @@
368 378 pageNumber: 0,
369 379 pageSize: 10,
370 380 belongingGreenwaySection:'',
371   - belongingDepartment:''
  381 + belongingDepartment:'',
  382 + publishStatus:''
372 383 },
373 384 this.getAll()
374 385 },
... ...
admin-web-master/src/views/serve/actSp.vue
  View file @fa21ce0
... ... @@ -314,6 +314,7 @@
314 314 </div>
315 315  
316 316 </el-dialog>
  317 +
317 318 </div>
318 319 </template>
319 320  
... ...
lvdao-miniapp/main.js
  View file @fa21ce0
... ... @@ -8,8 +8,8 @@ import uView from &quot;uview-ui&quot;;
8 8 import DialogBox from './components/DialogBox/DialogBox';
9 9 // let hostall = window.location.href;
10 10 // let c1 = hostall.split('cdwlMall')[0];
11   -let c1 = 'https://jy.scjysm.asia:18086/'
12   -// let c1 = 'https://zhgw-uat.028wlkj.com/'
  11 +// let c1 = 'https://jy.scjysm.asia:18086/'
  12 +let c1 = 'https://zhgw-uat.028wlkj.com/'
13 13 Vue.config.productionTip = false
14 14 Vue.prototype.$http = http
15 15 Vue.prototype.$imgUrl = (url) => {
... ...
lvdao-miniapp/pages.json
  View file @fa21ce0
... ... @@ -271,6 +271,7 @@
271 271 "style": {
272 272 "navigationBarTitleText": "商务合作",
273 273 "navigationBarBackgroundColor": "#FFFFFF"
  274 + // "navigationStyle": "custom" // 取消导航栏
274 275 }
275 276 },
276 277 {
... ...
lvdao-miniapp/pages/business/businessDetail/businessDetail.scss
  View file @fa21ce0
... ... @@ -51,7 +51,7 @@
51 51 white-space: nowrap;
52 52 overflow : hidden;
53 53 text-overflow: ellipsis;
54   - margin-bottom: 60rpx;
  54 +
55 55 margin-top: 10rpx;
56 56 }
57 57 .info-item {
... ...
lvdao-miniapp/pages/business/businessDetail/businessDetail.vue
  View file @fa21ce0
... ... @@ -16,11 +16,13 @@
16 16 <view class="img">
17 17 <u-image width="100%" height="100%" borderRadius="10" :src="imgurl+tableData.cereBasicInformationVenue.displayImage"></u-image>
18 18 </view>
19   - <view class="info">
  19 + <view class="info" @click="gomapApp(latitude,longitude)">
20 20 <view class="title">{{tableData.cereBasicInformationVenue.venueName}}</view>
21 21 <view class="info-item">
22   - <image :src="$imgUrl('/kefu.png')"></image>
23   - <!-- <text>{{tableData.cereBasicInformationVenue.detailedLocation}}</text> -->
  22 + <image :src="$imgUrl('/kefu.png')" style="margin-top: 8px;"></image>
  23 + <map style="width: 100%; height: 70rpx;" longitude="104.06730651855469" latitude="30.65681556429287" >
  24 + <text>{{tableData.cereBasicInformationVenue.district}}</text>
  25 + </map>
24 26 </view>
25 27 </view>
26 28 </view>
... ... @@ -49,7 +51,9 @@ export default {
49 51 data() {
50 52 return {
51 53 tableData:{},
52   - imgurl:''
  54 + imgurl:'',
  55 + latitude: null,
  56 + longitude: null,
53 57 };
54 58 },
55 59 onLoad(option){
... ... @@ -61,6 +65,10 @@ export default {
61 65 this.tableData.previousEvents = this.tableData.previousEvents.split(',');
62 66 }
63 67 console.log(this.tableData)
  68 +if (this.tableData.mapMarker) {
  69 + this.latitude = parseFloat(this.tableData.mapMarker.split(',')[0])
  70 + this.longitude = parseFloat(this.tableData.mapMarker.split(',')[1])
  71 + }
64 72 let obj ={
65 73 id:this.tableData.id,
66 74 viewsNumber:Number(this.tableData.viewsNumber) +1
... ... @@ -75,6 +83,17 @@ export default {
75 83 url: '/pages/leaseAdd/leaseAdd'
76 84 })
77 85 },
  86 + // 打开的点击事件，传经纬度和地点名
  87 + gomapApp(latitude, longitude, ) {
  88 + let url = "";
  89 + uni.openLocation({
  90 + latitude: latitude,
  91 + longitude: longitude,
  92 + success: function() {
  93 + console.log('success');
  94 + }
  95 + });
  96 + },
78 97 }
79 98 };
80 99 </script>
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @fa21ce0
... ... @@ -187,7 +187,7 @@
187 187 // path: '/pages/participation/participation'
188 188 },
189 189 {
190   - name: '活动申请',
  190 + name: '活动发布',
191 191 img: '/hdsq.png',
192 192 path: '/pages/activityAdd/activityAdd'
193 193 },
... ...
lvdao-miniapp/utils/request.js
  View file @fa21ce0
... ... @@ -21,7 +21,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23  
24   - bases = 'http://128.10.249.42:9003'+ url;
  24 + bases = 'http://128.10.249.41:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27 27 // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
... ... @@ -30,7 +30,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
30 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33   - bases = 'http://128.10.249.42:9007' + url;
  33 + bases = 'http://128.10.249.41:9007' + url;
34 34 // bases = c1 + 'cdwlMall/meserver/api' + url;
35 35  
36 36 }else{
... ... @@ -39,7 +39,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
39 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42   - bases = 'http://128.10.249.42:9004' + url;
  42 + bases = 'http://128.10.249.41:9004' + url;
43 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44 44 // bases = c1 + 'cdwlMall/business-server' + url;
45 45  
... ...
merchant-web-master/src/utils/request.js
  View file @fa21ce0
... ... @@ -21,7 +21,7 @@ let PREFIX;
21 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22 22 // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
23 23 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
24   - PREFIX = 'http://128.10.249.42:9004';
  24 + PREFIX = 'http://128.10.249.41:9004';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ...
merchant-web-master/src/utils/request2.js
  View file @fa21ce0
... ... @@ -21,7 +21,7 @@ let PREFIX;
21 21 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api';
22 22 // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
23 23  
24   - PREFIX = 'http://128.10.249.42:9007';
  24 + PREFIX = 'http://128.10.249.41:9007';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ...
merchant-web-master/src/views/comprehensive/pEranking/index.vue
  View file @fa21ce0
... ... @@ -191,7 +191,7 @@ async search(){
191 191 }
192 192  
193 193 const Orderlist = await productEvaluationRanking({startTime:startTimeS,endTime:endTimeS})
194   - this.tableData = Orderlist.data
  194 + this.tableData = Orderlist.data.sort((a, b) => b.evaluationsNumber - a.evaluationsNumber);
195 195 this.total = Orderlist.data.length
196 196 },
197 197 clear(){
... ...