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

wesley88
2 parents d560e431 b2f2d4c0
Showing 10 changed files with 47 additions and 15 deletions
admin-web-master/src/views/detect/information/index.vue
admin-web-master/src/views/serve/actSp.vue
lvdao-miniapp/pages.json
lvdao-miniapp/pages/business/businessDetail/businessDetail.scss
lvdao-miniapp/pages/business/businessDetail/businessDetail.vue
lvdao-miniapp/pages/workbench/workbench.vue
lvdao-miniapp/utils/request.js
merchant-web-master/src/utils/request.js
merchant-web-master/src/utils/request2.js
merchant-web-master/src/views/comprehensive/pEranking/index.vue
@@ -22,6 +22,15 @@
             <el-form-item label="归属部门" prop="belongingDepartment">
               <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
+			<el-form-item label="状态" prop="publishStatus">
+			  <el-select v-model="pagequery.publishStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+			    <el-option label="待发布" value="0"></el-option>
+				<el-option label="待审核" value="1"></el-option>
+				<el-option label="已发布" value="2"></el-option>
+				<el-option label="不通过" value="3"></el-option>
+				<el-option label="已租赁" value="4"></el-option>
+			  </el-select>
+			</el-form-item>
           </el-form>
  
           <div>
@@ -169,7 +178,8 @@
           pageNumber: 0,
           pageSize: 10,
           belongingGreenwaySection:'',
-          belongingDepartment:''
+          belongingDepartment:'',
+		  publishStatus:''
         },
         tableData: [],
         total: 0,
@@ -368,7 +378,8 @@
             pageNumber: 0,
             pageSize: 10,
             belongingGreenwaySection:'',
-            belongingDepartment:''
+            belongingDepartment:'',
+			publishStatus:''
           },
           this.getAll()
       },
@@ -314,6 +314,7 @@
 						     </div>
  
 						   </el-dialog>
+						   
   </div>
 </template>
  
@@ -271,6 +271,7 @@
 			"style": {
 				"navigationBarTitleText": "商务合作",
 				"navigationBarBackgroundColor": "#FFFFFF"
+			//	"navigationStyle": "custom" // 取消导航栏
 			}
 		},
 		{
@@ -51,7 +51,7 @@
 			white-space: nowrap;
 			overflow : hidden;
 			text-overflow: ellipsis;
-			margin-bottom: 60rpx;
+			
 			margin-top: 10rpx;
 		}
 		.info-item {
@@ -16,11 +16,13 @@
 			<view class="img">
 				<u-image width="100%" height="100%" borderRadius="10" :src="imgurl+tableData.cereBasicInformationVenue.displayImage"></u-image>
 			</view>
-			<view class="info">
+			<view class="info" @click="gomapApp(latitude,longitude)">
 				<view class="title">{{tableData.cereBasicInformationVenue.venueName}}</view>
 				<view class="info-item">
-					<image  :src="$imgUrl('/kefu.png')"></image>
-					<!-- <text>{{tableData.cereBasicInformationVenue.detailedLocation}}</text> -->
+					<image  :src="$imgUrl('/kefu.png')" style="margin-top: 8px;"></image>
+					<map style="width: 100%; height: 70rpx;" longitude="104.06730651855469" latitude="30.65681556429287"  >
+					<text>{{tableData.cereBasicInformationVenue.district}}</text>
+							</map>
 				</view>
 			</view>
 		</view>
@@ -49,7 +51,9 @@ export default {
   data() {
     return {
 		tableData:{},
-		imgurl:''
+		imgurl:'',
+		latitude: null,
+		longitude: null,
     };
   },
   onLoad(option){
@@ -61,6 +65,10 @@ export default {
 	            this.tableData.previousEvents = this.tableData.previousEvents.split(',');
 	  }
   	  console.log(this.tableData)
+if (this.tableData.mapMarker) {
+	  	this.latitude = parseFloat(this.tableData.mapMarker.split(',')[0])
+	  	this.longitude = parseFloat(this.tableData.mapMarker.split(',')[1])
+	  }
 	  let obj ={
 		  id:this.tableData.id,
 		  viewsNumber:Number(this.tableData.viewsNumber) +1 
@@ -75,6 +83,17 @@ export default {
 				url: '/pages/leaseAdd/leaseAdd'
 			})
 		},
+		// 打开的点击事件，传经纬度和地点名
+		gomapApp(latitude, longitude, ) {
+			let url = "";
+			uni.openLocation({
+				latitude: latitude,
+				longitude: longitude,
+				success: function() {
+					console.log('success');
+				}
+			});
+		},
   }
 };
 </script>
@@ -187,7 +187,7 @@
 							// path: '/pages/participation/participation'
 						},
 						{
-							name: '活动申请',
+							name: '活动发布',
 							img: '/hdsq.png',
 							path: '/pages/activityAdd/activityAdd'
 						},
@@ -21,7 +21,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
  
-		// bases = 'http://128.10.249.42:9003'+ url;
+		bases = 'http://128.10.249.41:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
  
 		bases = c1 + 'cdwlMall/meserver/admin-server' + url;
@@ -30,8 +30,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
 		// bases = 'http://128.10.249.22:9003:9007' + url;
-		// bases = 'http://128.10.249.42:9007' + url;
-		bases = c1 + 'cdwlMall/meserver/api' + url;
+		bases = 'http://128.10.249.41:9007' + url;
+		// bases = c1 + 'cdwlMall/meserver/api' + url;
  
 	}else{
 		// bases = 'http://128.10.249.22:9004' + url;
@@ -39,7 +39,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
-		// bases = 'http://128.10.249.42:9004' + url;
+		bases = 'http://128.10.249.41:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
 		bases = c1 + 'cdwlMall/business-server' + url;
  
@@ -21,7 +21,7 @@ let PREFIX;
   // PREFIX = 'http://8.130.38.56:8027/business-server';
   // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-  PREFIX = 'http://128.10.249.42:9004';
+  PREFIX = 'http://128.10.249.41:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
@@ -21,7 +21,7 @@ let PREFIX;
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api';
   // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
  
-  PREFIX = 'http://128.10.249.42:9007';
+  PREFIX = 'http://128.10.249.41:9007';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';
@@ -191,7 +191,7 @@ async search(){
   }
  
   const Orderlist = await productEvaluationRanking({startTime:startTimeS,endTime:endTimeS})
-  this.tableData = Orderlist.data
+  this.tableData =  Orderlist.data.sort((a, b) => b.evaluationsNumber - a.evaluationsNumber);
   this.total = Orderlist.data.length
 },
 clear(){