更新问题

App.vue

@@ -16,7 +16,9 @@ export default {
 	user_headUrl:'',
 	globalAuth:false,
 	session_key: '',
-	isAndroid:false
+	isAndroid:false,
+	user_department:'',
+	user_real_name:'',
   },
   onLaunch: function () {
     console.log("App Launch");
@@ -49,12 +51,12 @@ export default {
 	  	let that = this;
 	  	uni.login({
 	  		success(res) {
-				console.log(res)
 	  		   that.loginRequest(res.code)
 	  		}
 	  	})
 	  },
 	  loginRequest(codeRes){
+		let that = this;
 	  	let md5Sign = md5("method="+'user'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
 	  	let url = getApp().globalData.shareUrl+'api/api.php'+'?method=user&action=login&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
 	  	uni.request({
@@ -72,7 +74,7 @@ export default {
 	  			//	getApp().globalData.session_key = res.data.data.session_key;
 	  				getApp().globalData.open_id = res.data.data.openid;
 					getApp().globalData.user_status = res.data.data.status;
-					this.getUserInfo(getApp().globalData.open_id)
+					that.$isResolve();
 				//	getApp().globalData.globalAuth = res.data.data.status ? true : false;
 					// getApp().globalData.user_phone = res.data.data.phone;
 				//	uni.hideLoading() 
@@ -83,40 +85,6 @@ export default {
 	  		}
 	  	});
 	  },
-	  getUserInfo(openid) {
-	    let md5Sign = md5(
-	      "method=" +
-	        "user" +
-	        "&timestamp=" +
-	        getApp().globalData.globalTimestamp +
-	        "&secret=" +
-	        getApp().globalData.secret
-	    );
-	    let url =
-	      getApp().globalData.shareUrl +
-	      "api/api.php" +
-	      "?method=user&action=info_by_openid&timestamp=" +
-	      getApp().globalData.globalTimestamp +
-	      "&sign=" +
-	      md5Sign;
-	    uni.request({
-	      url: url,
-	      method: "POST",
-	      header: {
-	        "content-type": "application/x-www-form-urlencoded",
-	      },
-	      data: {
-	        openid:openid,
-	      },
-	      success: (res) => {
-	        if (res.data.code === 200) {
-	        }
-	      },
-	      fail: () => {
-	        console.log("连接失败");
-	      },
-	    });
-	  },
   }
 };
 </script>

main.js

@@ -4,6 +4,9 @@ import App from "./App";
 import Vue from "vue";
 Vue.config.productionTip = false;
 App.mpType = "app";
+Vue.prototype.$getOpenId = new Promise(resolve => {
+  Vue.prototype.$isResolve = resolve;
+})
 const app = new Vue({
   ...App,
 });
@@ -47,8 +50,8 @@ Vue.filter("globalTimeSecond", function (value) {
     const h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
     const mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
     const s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
-   // return h + ":" + mm + ":" + s;
-   return h + ":" + mm;
+   return h + ":" + mm + ":" + s;
+  // return h + ":" + mm;
   } else {
     return "";
   }

pages/index/index.vue

@@ -31,12 +31,12 @@ export default {
 	},
   data() {
     return {
-      isAuth: getApp().globalData.globalAuth,
-      userHeadImg: "/static/logo.png",
-      userNickName: "子众",
+      isAuth: true,
+      userHeadImg: "",
+      userNickName: "",
       list: [
         { 
-		 icoin: "/static/sign.png",
+		 icoin: "/static/upload.png",
 		 name: "内容上传" ,
 		 url: "/pages/index/upload/upload",
 		 isShow:true,
@@ -50,15 +50,59 @@ export default {
       ],
     };
   },
-  onLoad() {
+  async onLoad() {
+	  // setTimeout(()=>{
+	  // 		this.getUserInfo()
+	  // },1000)
+	  await this.$getOpenId
+	  this.getUserInfo()
   },
   onShow() {
-   //  if(this.isAuth){
-   //   this.userHeadImg = getApp().globalData.user_headUrl;
-   //   this.userNickName = getApp().globalData.user_name;
-   //  }
   },
   methods: {
+	getUserInfo() {
+	    let md5Sign = md5(
+	      "method=" +
+	        "user" +
+	        "&timestamp=" +
+	        getApp().globalData.globalTimestamp +
+	        "&secret=" +
+	        getApp().globalData.secret
+	    );
+	    let url =
+	      getApp().globalData.shareUrl +
+	      "api/api.php" +
+	      "?method=user&action=info_by_openid&timestamp=" +
+	      getApp().globalData.globalTimestamp +
+	      "&sign=" +
+	      md5Sign;
+	    uni.request({
+	      url: url,
+	      method: "POST",
+	      header: {
+	        "content-type": "application/x-www-form-urlencoded",
+	      },
+	      data: {
+	        openid:getApp().globalData.open_id,
+	      },
+	      success: (res) => {
+	        if (res.data.code === 200) {
+				if (res.data.data.nickname) {
+				  this.isAuth = true;
+				  this.userHeadImg = res.data.data.headimg;
+				  this.userNickName = res.data.data.nickname;
+				  getApp().globalData.user_department = res.data.data.department;
+				  getApp().globalData.user_real_name = res.data.data.real_name;
+				} else {
+				  this.isAuth = false;
+				}
+	        }
+	      },
+	      fail: () => {
+	        console.log("连接失败");
+	      },
+	    });
+	  },
 	uploadUserInfo(name,head){
 		let md5Sign = md5(
 		  "method=" +

pages/index/record/record.vue

@@ -3,7 +3,7 @@
     <view class="details" v-for="item in pageList" :key="item.id">
 		<view class="view">
 		  <!-- <span class="label">发布时间：</span> -->
-		  <span style="width: 80%;color: darkgray;">{{ item.publishTime }}</span>
+		  <span style="width: 80%;color: darkgray;">{{ item.addtime }}</span>
 		</view>
       <view class="view">
         <!-- <span class="label">详情：</span> -->
@@ -12,8 +12,8 @@
       <view class="view">
         <!-- <span class="label">图片：</span> -->
         <view class="flex-box">
-          <view v-if="imageList.length == 0">-</view>
-          <image :src="item.url" v-for="item in imageList" :key="item.id" mode="aspectFit" @click="showlarge(item.url)"/>
+          <view v-if="item.attach_list.length == 0">-</view>
+          <image :src="globalUrl + item1" v-for="(item1,index) in item.attach_list" :key="index" mode="aspectFit" @click="showlarge(item1)"/>
         </view>
       </view>
     </view>
@@ -30,25 +30,26 @@ export default {
       details: "",
       imageList: [],
       time: "",
+	  globalUrl:getApp().globalData.shareUrl,
 	  pageList:[
-		  {
-			  id:'1',
-			  content:'从现在起直到21世纪中叶的30年，将有可能成为“人类命运共同体”在世界范围逐步实现的关键阶段。随着“人类命运共同体”在世界范围逐步成为现实，大国关系包含中美关系经过种种曲折，逐步转化到一个相互尊重、平等相待、和平共处、合作共赢的轨道上来，这才是人心所向',
-			  imgList:[],
-			  publishTime:'2021.12.25 14:15:00'
-		  },
-		  {
-			   id:'2',
-			  content:'从现在起直到21世纪中叶的30年，将有可能成为“人类命运共同体”在世界范围逐步实现的关键阶段。随着“人类命运共同体”在世界范围逐步成为现实，大国关系包含中美关系经过种种曲折，逐步转化到一个相互尊重、平等相待、和平共处、合作共赢的轨道上来，这才是人心所向',
-			  imgList:[],
-			  publishTime:'2021.12.26 12:11:00'
-		  },
-		  {
-			  id:'3',
-			  content:'从现在起直到21世纪中叶的30年，将有可能成为“人类命运共同体”在世界范围逐步实现的关键阶段。随着“人类命运共同体”在世界范围逐步成为现实，大国关系包含中美关系经过种种曲折，逐步转化到一个相互尊重、平等相待、和平共处、合作共赢的轨道上来，这才是人心所向',
-			  imgList:[],
-			  publishTime:'2021.12.27 13:35:00'
-		  },
+		  // {
+			 //  id:'1',
+			 //  content:'从现在起直到21世纪中叶的30年，将有可能成为“人类命运共同体”在世界范围逐步实现的关键阶段。随着“人类命运共同体”在世界范围逐步成为现实，大国关系包含中美关系经过种种曲折，逐步转化到一个相互尊重、平等相待、和平共处、合作共赢的轨道上来，这才是人心所向',
+			 //  imgList:[],
+			 //  publishTime:'2021.12.25 14:15:00'
+		  // },
+		  // {
+			 //   id:'2',
+			 //  content:'从现在起直到21世纪中叶的30年，将有可能成为“人类命运共同体”在世界范围逐步实现的关键阶段。随着“人类命运共同体”在世界范围逐步成为现实，大国关系包含中美关系经过种种曲折，逐步转化到一个相互尊重、平等相待、和平共处、合作共赢的轨道上来，这才是人心所向',
+			 //  imgList:[],
+			 //  publishTime:'2021.12.26 12:11:00'
+		  // },
+		  // {
+			 //  id:'3',
+			 //  content:'从现在起直到21世纪中叶的30年，将有可能成为“人类命运共同体”在世界范围逐步实现的关键阶段。随着“人类命运共同体”在世界范围逐步成为现实，大国关系包含中美关系经过种种曲折，逐步转化到一个相互尊重、平等相待、和平共处、合作共赢的轨道上来，这才是人心所向',
+			 //  imgList:[],
+			 //  publishTime:'2021.12.27 13:35:00'
+		  // },
 	  ]
     };
   },
@@ -57,6 +58,7 @@ export default {
   },
   methods: {
 	showlarge(src){
+		src = this.globalUrl + src
 		uni.previewImage({
 		  urls: [src],
 		  longPressActions: {
@@ -68,6 +70,13 @@ export default {
 		  },
 		});
 	},
+	filterData(list){
+		list.forEach((item)=>{
+			 let time = this.$options.filters["globalTime"](item.addtime);
+			 let timeSecond = this.$options.filters["globalTimeSecond"](item.addtime);
+			 item.addtime = time + " " + timeSecond;
+		})
+	},
     getRecordList() {
       let md5Sign = md5(
         "method=" +
@@ -99,21 +108,8 @@ export default {
         success: (res) => {
           console.log(res.data.data);
           if (res.data.code === 200) {
-            let data = res.data.data;
-            this.details = data.content;
-            this.title = data.title;
-            let time = this.$options.filters["globalTime"](data.addtime);
-            let timeSecond = this.$options.filters["globalTimeSecond"](
-              data.addtime
-            );
-            this.time = time + " " + timeSecond;
-            this.info.name = data.company_name;
-            this.info.code = data.company_code;
-            this.info.tel = data.phone;
-            this.imageList = data.attach_list.map((item) => {
-              item.url = getApp().globalData.shareUrl + item.url;
-              return item;
-            });
+			this.pageList = res.data.data.list;
+			this.filterData(this.pageList)
           }
         },
         fail: () => {
@@ -141,7 +137,7 @@ export default {
     width: 90%;
     margin: 0 2%;
     padding: 2% 3%;
-	border-bottom: 1px solid #f2f2f2;
+	border-bottom: 3px solid #f2f2f2;
     // border-radius: 50rpx;
     // box-shadow: rgba(100, 100, 111, 0.2) 0rpx 14rpx 50rpx 14rpx;
     image {
@@ -151,7 +147,7 @@ export default {
       margin: 0 2%;
     }
     .view {
-      margin: 2% 0;
+      margin: 3% 0;
     }
     .label {
       display: inline-block;

pages/index/upload/upload.vue

@@ -3,7 +3,7 @@
     <view class="supplyInfo">
       <view class="flex">
         <label>输入文本:</label>
-        <textarea v-model="supplyInfo.msg" class="area card"></textarea>
+        <textarea v-model="msg" class="area card"></textarea>
       </view>
       <view class="update_photo">
         <view class="title"></view>
@@ -30,11 +30,11 @@
       </view>
 	  <view class="flex">
 		<label>支部：</label>
-		<input type="text" v-model="supplyInfo.title" class="input card" />
+		<input type="text" v-model="department" class="input card" />
 	  </view>
 	  <view class="flex">
 		<label>姓名：</label>
-		<input type="text" v-model="supplyInfo.name" class="input card" />
+		<input type="text" v-model="name" class="input card" />
 	  </view>
 	 <button class="submit" @tap="submit">提交</button>
     </view>
@@ -46,21 +46,21 @@ import md5 from "@/common/md5.js";
 export default {
   data() {
     return {
-      supplyInfo: {
-        title: "",
-        msg: "",
-		name:''
-      },
+      department: getApp().globalData.user_department,
+      msg: '',
+	  name:getApp().globalData.user_real_name,
       uploadList: [],
       imgIdList: [],
     };
   },
+  onLoad() {
+  },
   methods: {
     submit() {
       if (
-        this.supplyInfo.name === "" ||
-        this.supplyInfo.title === "" ||
-        this.supplyInfo.msg === ""
+        this.name === "" ||
+        this.department === "" ||
+        this.msg === ""
       ) {
         uni.showToast({
           title: "内容不完善",
@@ -87,9 +87,9 @@ export default {
       let postData = {
 			openid :getApp().globalData.open_id,
 			activity_id : 1 ,  //这里固定是1
-			content : this.supplyInfo.msg,
-			department :this.supplyInfo.title,
-			user_name :  this.supplyInfo.name,
+			content : this.msg,
+			department :this.department,
+			user_name :  this.name,
 			attach_ids :this.imgIdList.join(),   //  3,34,5,5,6 
       };
       uni.request({