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

杨鑫
2 parents ff404ccf 5149de3a
Showing 11 changed files with 151 additions and 39 deletions
admin-web-master/src/components/add/addht.vue
admin-web-master/src/components/change/mbadd.vue
admin-web-master/src/components/merchantInformation/index.vue
admin-web-master/src/components/resourceCommodity/index.vue
admin-web-master/src/views/rent/audit/index.vue
lvdao-miniapp/App.vue
lvdao-miniapp/components/tabbar/tabbar.vue
lvdao-miniapp/manifest.json
lvdao-miniapp/pages/message/message.vue
lvdao-miniapp/pagesA/procedureList/procedureList.vue
lvdao-miniapp/utils/request.js
@@ -14,7 +14,7 @@
         </el-row>
       </el-form>
       <TitleWithCircle title="合同信息" style="margin-bottom: 20px;" />
-      <mbadd v-if="isshow" ref="rulesallForm" :list1="list1" />
+      <mbadd v-if="isshow" ref="rulesallForm" :list1="list1" :isdel="isdel" />
       <div style="margin-top: 20px;margin-left: 65px;">
         <el-button @click="close()" class="buttonHover" style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
         <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
@@ -125,6 +125,10 @@ import {
         type: Object,
         default: {}
       },
+      isdel: {
+        type: String,
+        default:''
+      },
       contractChangeReason: {
         type: String,
         default: ''
@@ -132,7 +132,7 @@
 										</el-table-column>
-										<el-table-column label="操作" v-if="!iscopy">
+										<el-table-column label="操作" v-if="!iscopy && isdel == ''">
 											<template slot-scope="scope">
 												<div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
 											</template>
@@ -171,6 +171,10 @@
 			zy
 		},
 		props: {
+			isdel: {
+				type: String,
+				default:''
+			},
 			list1: {
 				type: Array,
 				default: []
@@ -177,7 +177,8 @@
     },
     methods: {
       minSev() {
-        
+        let that = this
+        console.error(this.info)
         // return
         cerePlatformMerchantedit({
           ...this.info,
@@ -190,6 +191,7 @@
               message: '处理成功',
               type: 'success'
             })
+            that.setmsg()
             this.info.checkState = this.radio
             this.$emit('removeonaction', '1')
           } else {
@@ -200,6 +202,18 @@
           }
         })
       },
+     async setmsg() {
+        let info = {
+          type:'通知消息',
+          phone:this.info.phone,
+          content:{
+            type:'1',
+            title:this.radio=='2'?'商家审核已通过':this.radio=='3'?'商家审核已驳回':'商家',
+            content:this.checkOpinion
+          },
+        }
+        await this.$setmsg(info);
+      },
       changetype(){
         this.xiangTab= 'first'
         this.$emit('removeonaction', '1')
@@ -52,11 +52,11 @@
                       <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}</div>
                     </el-form-item>
                   </el-col>
-				  <el-col :span="8">
-				    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
-				      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无'}}</div>
-				    </el-form-item>
-				  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
+                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="8">
                     <el-form-item label="门牌号" prop="houseNumber">
                       <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
@@ -258,20 +258,45 @@
             </div>
           </div>
         </el-tab-pane>
-        <!--   <el-tab-pane label="人流情况" name="fourth" v-if="edit">
-            <div style="margin-top: 30px;" class="editcss">
-              <div class="titles">
-                人流量情况
-              </div>
-             </div>
-          </el-tab-pane>
-          <el-tab-pane label="物业维护记录" name="five" v-if="edit">
-            <div style="margin-top: 30px;" class="editcss">
-              <div class="titles">
-                物业维护记录
-              </div>
-             </div>
-          </el-tab-pane> -->
+        <el-tab-pane label="店铺信息" name="fourth" v-if="dpinfo">
+          <div style="margin-top: 30px;" class="editcss">
+            <TitleWithCircle title="基础信息" />
+            <div style="padding: 20px;">
+              <el-form :model="editbgid" ref="ruleForm" label-width="120px" class="demo-ruleForm">
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-form-item label="店铺名称" prop="shopName">
+                      <div class="duiqi">{{dpinfo.shopName}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="营业时间" prop="businessHours">
+                      <div class="duiqi">{{dpinfo.businessHours}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="联系电话" prop="contactNumber">
+                      <div class="duiqi">{{dpinfo.contactNumber}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="位置描述" prop="locationDescription">
+                      <div class="duiqi">{{dpinfo.locationDescription}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="店铺介绍" prop="shopDescription">
+                      <div class="duiqi">{{dpinfo.shopDescription}}</div>
+                    </el-form-item>
+                <el-form-item label="店内照片" prop="shopPhotos">
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in dpinfo.shopPhotos.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-show="type == '2'">
@@ -324,7 +349,8 @@
     cereBusinessPlan,
     cereBusinessOperationqueryByPage,
     cereContractInformation,
-    resourcesFindPlan
+    resourcesFindPlan,
+    cereAssetShopInformationqueryByPage
   } from '@/api/newly';
   import newmap from "@/components/newmap/index";
   import {
@@ -334,6 +360,9 @@
 	lvdaoduan,
   } from '@/api/information.js';
   import allimg from '@/components/chakan/allimg.vue';
+  import {
+    contractGetAllnew
+  } from '@/api/manage.js'
   export default {
     components: {
       TitleWithCircle,
@@ -380,10 +409,11 @@
         datalist: [],
         datalist1:[],
         datalistxsj:[],
-		lvdaoList:[]
+        lvdaoList:[],
+        dpinfo:null
       }
     },
-    created() {
+    async created() {
       console.error(this.editbgid)
       if (this.editbgid.id) {
@@ -416,11 +446,18 @@
         this.getAllxsj()
         this.getAllzl()
       }
-	  this.getAll()
+      const res = await contractGetAllnew({pageNumber: 0, pageSize:1,shopNumber:'sp' + this.editbgid.id,dataStatus:'1'})
+      if(res.data.content.length>0) {
+        const res1 = await cereAssetShopInformationqueryByPage({"pageNumber":0,"pageSize":10,"contractId":res.data.content[0].id})
+        if(res1.data.content.length>0){
+          this.dpinfo = res1.data.content[0]
+        }
+        console.log('=============1234567')
+        console.log(this.dpinfo)
+      }
+	    this.getAll()
     },
-	
     computed: {
-
     },
     methods: {
 		async	getAll(){
@@ -123,7 +123,7 @@
       </div>
       <div style="padding: 20px 20px 20px 0;">
-        <add :info="formInline" @removeonaction="removeonaction"></add>
+        <add :info="formInline" @removeonaction="removeonaction" :isdel="'1'"></add>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '3'">
@@ -6,12 +6,27 @@ export default {
 		// const host = 'https://zhld.028wlkj.com:49008/cdwlMall'
 		// let c1 = host.split('cdwlMall')[0];
 		//   console.error(c1);
+		let info = {
+			// phone:uni.getStorageSync('user').phone,
+			phone:'18121815598',
+		}
+		let that = this
+		// setInterval(() => {
+		// 	that.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{...info},1).then(res => {
+		// 		console.error(res)
+		// 		getApp().globalData.MessageNum = res.data
+		// 		that.$forceUpdate()
+		// 	})
+		// }, 6000)
 	},
 	onShow: function() {
 	},
 	onHide: function() {
 		console.log('App Hide');
+	},
+	globalData: {
+		MessageNum:0
 	}
 };
 </script>
@@ -45,6 +45,7 @@
 				codeheight: 0,
 				isOverall: 0,
 				phoneModel: '',
+				nums:getApp().globalData.MessageNum
 			};
 		},
 		props:{
 {
     "name" : "绿道",
-    "appid" : "__UNI__F034047",
+    "appid" : "__UNI__189D96A",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",
@@ -38,6 +38,31 @@
 					<view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view>
 				</view>
 			</view>
+			<view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=通知消息')">
+				<view class="icon-data">
+					<view class="icon">
+						<image :src="$imgUrl('/xtxx.png')"  mode=""></image>
+					</view>
+					<view class="data">
+						<view class="title">
+							<text>通知消息</text>
+						</view>
+						
+						<view class="describe">
+							<view v-if="tzlist.length>0" >
+								<view v-if="tzlist[0].content.type == '2'">{{tzlist[0].content.title}}【图片】</view>
+								<view v-else >{{tzlist[0].content.title}}</view>
+							</view>
+							<view v-else >暂无</view>
+							<!-- <text>{{?tableList[0].content:''}}</text> -->
+						</view>
+					</view>
+				</view>
+				<view class="more">
+					<view class="more-num" v-if="tzlist.length>0">{{tzlist.length}}</view>
+					<view class="icon-more" v-if="tzlist.length>0">{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}</view>
+				</view>
+			</view>
 			<view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租赁提醒')">
 				<view class="icon-data">
 					<view class="icon">
@@ -87,7 +112,8 @@
 					pageSize: 2,
 					receiverMerchant:''
 				},
-				zllist:[]
+				zllist:[],
+				tzlist:[]
 			}
 		},
@@ -125,14 +151,13 @@
 		methods:{
 			getmsg() {
 				this.zllist = []
+				this.tzlist = []
 				let info = {
 					// phone:uni.getStorageSync('user').phone,
 					phone:'18121815598',
 					isRead:'0'
 				}
-				this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{...info},1).then(res => {
-					// console.error(res)
-				})
+				
 				this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => {
 					let obj = res.data.data
 					for(let prop in obj) {
@@ -141,7 +166,18 @@
 							this.zllist.push(obj[prop][0])
 					    }
 					}
-					console.error(this.zllist)
+					this.zllist.reverse()
+				})
+				this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'通知消息'},1).then(res => {
+					let obj = res.data.data
+					for(let prop in obj) {
+					    if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
+							obj[prop][0].content = JSON.parse(obj[prop][0].content)
+							this.tzlist.push(obj[prop][0])
+					    }
+					}
+					this.tzlist.reverse()
+					console.error(this.tzlist)
 				})
 			},
 			formatDateTime(dateTimeString) {
@@ -54,6 +54,7 @@
 						this.tableList.push(obj[prop][0])
 				    }
 				}
+				this.tableList.reverse()
 				console.error(this.tableList)
 			})
 			// this.tableList = JSON.parse(option.item)
@@ -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.41: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.41: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.41: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;