更新内容

App.vue

@@ -3,8 +3,8 @@ import md5 from '@/common/md5.js';
 export default {
   globalData: {
     //shareUrl: 'https://gdoctor.xazhima.com/api/v1.0/api.php', //开发环境全局接口域名 线上:https://guolu.xazhima.com/
-   // shareUrl: "https://kiq.xazhima.com/",
-	shareUrl:"https://kgwxxcx.xixianxinqu.gov.cn/1026airqt/",
+    shareUrl: "https://kiq.xazhima.com/",
+	//shareUrl:"https://kgwxxcx.xixianxinqu.gov.cn/1026airqt/",
     globalTimestamp: Date.now().toString(),
     secret: "AirQK_weichat_app_zhima",
     selectedIndex:0,
@@ -15,7 +15,7 @@ export default {
 	user_name:'',
 	user_phone:'',
 	user_headUrl:'',
-	isAuth:false,
+	globalAuth:false,
 	session_key: '',
 	contact_name:'',
 	company_name:'',
@@ -76,7 +76,7 @@ export default {
 	  				getApp().globalData.open_id = res.data.data.openid;
 					getApp().globalData.user_status = res.data.data.status;
 					getApp().globalData.user_phone = res.data.data.phone;
-					uni.hideLoading()
+					uni.hideLoading() 
 	  			}
 	  		},
 	  		fail: () => {

components/top-title/top-title.vue

@@ -11,7 +11,7 @@ export default {
   props: {
     titleValue: {
       type: String,
-      default: 'Air企通',
+      default: '爱企通',
     },
 	pageScroll:{
 		type:Number,

components/uni-popup/uni-popup.vue

@@ -164,6 +164,9 @@ export default {
     &-box {
       position: relative;
       box-sizing: border-box;
+	  width: 80%;
+	  height: 80%;
+	  padding: 40rpx;
     }
 
     &.uni-custom {

manifest.json

@@ -50,9 +50,10 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx889d7d76e7aa3cd3",
+        "appid" : "wx1dbc76c97a3e4880",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "minified" : true
         },
         "usingComponents" : true
     },

pages/activity/activity_deatil.vue

@@ -56,12 +56,44 @@
       <!--         "status":"活动状态 0：待开始；1：已开始； 2：已结束
         "type":"活动类型 1:线上;2 线下"} -->
     </view>
+	<uni-popup ref="popup" :mask-click="false">
+	  <view class="popup-box">
+		  <view>
+			  <view class="popup-title">活动报名信息填写</view>
+			  <view class="popup-content-box">
+			  		  <view class="popup-content">
+			  			  <view class="popup-type" v-for="(info,index) in activityInfoList" :key="info.id">
+			  				  <view>{{info.name}}</view>
+							  <input type="text"  v-model="info.value"/>
+			  			  </view>
+<!-- 			  			  <view class="popup-type">
+			  			  	  <view>性别</view><input type="text" value="" />
+			  			  </view>
+			  			  <view class="popup-type">
+			  			  	  <view>年龄</view><input type="number" value="" />
+			  			  </view>
+			  			  <view class="popup-type">
+			  			  	  <view>工作单位</view><input type="text" value="" />
+			  			  </view>
+			  			  <view class="popup-type">
+			  			  	  <view>职务</view><input type="text" value="" />
+			  			  </view> -->
+			  		  </view>
+			  </view>
+		  </view>
+		  <view class="popup-footer">
+		  	<button class="popup-cancel" @click="closePopup">取消</button>
+		  	<button class="popup-submit" @click="submitInfo">提交</button>
+		  </view>
+	  </view>
+	</uni-popup>
   </view>
 </template>
 
 <script>
 import md5 from "@/common/md5.js";
 import activity_rich_card from "../policy/policy_rich_card";
+import uniPopup from "@/components/uni-popup/uni-popup.vue"
 export default {
   filters: {
     formDateTime(value) {
@@ -99,11 +131,13 @@ export default {
   },
   components: {
     activityRichCard: activity_rich_card,
+	uniPopup
   },
   data() {
     return {
       id: "",
       isJoin: false,
+	  activityInfoList:[],
       model: {
         title: "",
         read: 123,
@@ -208,17 +242,18 @@ export default {
           if (res.data.code == 200) {
             let data = res.data.data;
             this.isJoin = data.active ? true : false;
+			this.activityInfoList = data.category_list;
+			this.activityInfoList.forEach((item)=>{
+				item.value = '';
+			})
             this.model.title = data.name;
-            this.model.read =
-              parseInt(data.base_read_count) + parseInt(data.real_read_count);
+            this.model.read = parseInt(data.base_read_count) + parseInt(data.real_read_count);
             this.model.url = getApp().globalData.shareUrl + data.pic_url;
             let arr = ["start_time", "end_time"];
             let ans = [];
             for (const item of arr) {
               let time = this.$options.filters["formDateTime"](data[item]);
-              let timeSecond = this.$options.filters["formDateTimeSecond"](
-                data[item]
-              );
+              let timeSecond = this.$options.filters["formDateTimeSecond"](data[item]);
               ans.push(time + " " + timeSecond);
             }
             this.model.date = ans.join(" - ");
@@ -227,9 +262,7 @@ export default {
             this.model.way = data.sponsor;
             this.model.max_person = data.max_person;
             this.model.person_count = data.person_count;
-            this.model.share =
-              parseInt(data.real_repost_count) +
-              parseInt(data.base_repost_count);
+            this.model.share = parseInt(data.real_repost_count) + parseInt(data.base_repost_count);
             if (data.status == '待开始') {
               if (data.type == 2) {
                 this.model.activiteState = "我要参加";
@@ -290,7 +323,7 @@ export default {
         },
       });
     },
-    subscribeActivity() {
+    subscribeActivity(info) {
       if (this.model.person_count >= this.model.max_person) {
         uni.showToast({
           title: "报名人数已达上限",
@@ -299,18 +332,11 @@ export default {
         });
         return;
       }
-      let that = this;
-      uni.requestSubscribeMessage({
-        tmplIds: [
-          "bSg5tUWHE4qWDeyK31GBejogT1uRgkuBD1_n2I5ptAc",
-          "T_ORLiW2C_UM6nZiEerYAokltHgHRGxWCid8eElujus",
-        ],
-        success(res) {
-          that.signUpActivity();
-        },
-      });
+	  if(this.activityInfoList.length > 0){
+		  	this.open();
+	  }
     },
-    signUpActivity() {
+    signUpActivity(infoList) {
       let md5Sign = md5(
         "method=" +
           "activity" +
@@ -329,6 +355,7 @@ export default {
       let postData = {
         openId: getApp().globalData.open_id,
         id: this.id,
+		category_json:JSON.stringify(infoList)
       };
       uni.request({
         url: url,
@@ -352,6 +379,36 @@ export default {
         },
       });
     },
+	subscribeFn(info){
+		let that = this;
+		uni.requestSubscribeMessage({
+		  tmplIds: [
+		    // "bSg5tUWHE4qWDeyK31GBejogT1uRgkuBD1_n2I5ptAc",
+		    // "T_ORLiW2C_UM6nZiEerYAokltHgHRGxWCid8eElujus",
+				  "XPULJQ64YrS-5sAnfMTJj3S9iV8-8X_mb3r_H5dgAgE",
+				  "RWq7TE266RYr8DX2IHZ2F_zKbOnSfZDgh_xovBh0UiI" 		//测试环境模板id
+		  ],
+		  success(res) {
+		    that.signUpActivity(info);
+		  },
+		});
+	},
+	open() {
+		  this.$refs.popup.open('top')
+	  },
+	closePopup() {
+		  this.$refs.popup.close()
+	  },
+	submitInfo(){
+	    this.activityInfoList.forEach((item)=>{
+			delete item.addtime;
+			delete item.name;
+			delete item.parent_id;
+			delete item.weight;
+		})
+		this.$refs.popup.close();
+		this.subscribeFn(this.activityInfoList)
+	}  
   },
 };
 </script>
@@ -490,5 +547,51 @@ export default {
       }
     }
   }
+  .popup-box {
+	  height: 100%;
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: space-between;
+  }
+  .popup-title {
+	  text-align: center;
+	  font-weight: bold;
+	  height: 30px;
+	  border-bottom: 1px solid #d8d8d8;
+  }
+  .popup-content {
+	  font-size: 28rpx;
+	  padding: 10rpx 0 10rpx 0;
+  }
+  .popup-type {
+	  display: flex;
+	  height: 80rpx;
+	  align-items: center;
+		view {
+			width: 25%; 
+		}
+		input {
+			border: 1px solid #d7d7d7;
+			width: 70%;
+			border-radius: 5rpx;
+			padding-left: 10rpx;
+		}
+  }
+  .popup-footer {
+	  display: flex;
+	  button{
+		  font-size: 26rpx;
+		  height: 60rpx;
+		  width: 150rpx;
+		  line-height: 60rpx;
+		  color: #FFFFFF;
+	  }
+  }
+  .popup-cancel {
+	  background-color: #AAAAAA;
+  }
+  .popup-submit {
+	  background-color: #249CD3;
+  }
 }
 </style>

pages/activity/index.vue

@@ -208,7 +208,8 @@ export default {
       let postData = {
         // page: 1,
         // page_size: 15,
-		 s_cancel : 0
+		 s_cancel : 0,
+		 order_by : "weight desc,id desc"
       };
       uni.request({
         url: url,

pages/auth/index.vue

@@ -3,7 +3,7 @@
 		
 		<image src="/static/logo.jpg" mode="aspectFill"></image>
 		
-		<text class="margin-top-3 auth-title">欢迎使用Air企通小程序</text>
+		<text class="margin-top-3 auth-title">欢迎使用爱企通小程序</text>
 		
 		<text class="margin-top-3 auth-content">此页面是微信授权页面,授权之后你可以获取更优质的服务,您的隐私将会受到保护</text>
 		
@@ -48,6 +48,7 @@
 						if(res.data.code === 200){
 								if(res.data.data.nickname){
 									getApp().globalData.isAuth = true;
+									getApp().globalData.globalAuth = true;
 									getApp().globalData.user_phone = false;
 									getApp().globalData.user_name = res.data.data.nickname;
 									this.isAuth = true;
@@ -55,6 +56,7 @@
 								}else{
 									getApp().globalData.user_name = '';
 									getApp().globalData.isAuth = false;
+									getApp().globalData.globalAuth = false; 
 									this.isAuth = false;
 								}
 						}
@@ -74,10 +76,12 @@
 						this.encryptedData = res.encryptedData;
 						this.isAuth = true;
 						getApp().globalData.isAuth = true; 
+						getApp().globalData.globalAuth = true; 
 						this.loginUserInfo()
 					},
 					fail:(err)=> {
 						getApp().globalData.isAuth = false;
+						getApp().globalData.globalAuth = false; 
 						this.isAuth = false;
 					}
 				})

pages/enterprise/index.vue

@@ -41,7 +41,9 @@
           <view class="line"></view>
           <view class="view">
             <view class="info_t">注册资本</view>
-            {{ company.capital }}万元
+            {{ company.capital }}万
+			 <text v-if="company.capital_type == '1'">美元</text>
+			 <text v-else>人民币</text>
           </view>
           <view class="line"></view>
           <view class="view">
@@ -101,6 +103,7 @@ export default {
         md5Sign;
       let postData = {
         s_pub: "1",
+		order_by : "weight desc,id desc"
       };
       uni.request({
         url: url,
@@ -114,13 +117,13 @@ export default {
             let list = res.data.data.list;
             console.log(res.data.data.list);
             list.forEach((e, i) => {
-              let { pic_url, name, representative, capital, found_date, id } =
-                e;
+              let { pic_url, name, representative, capital, capital_type, found_date, id } = e;
               list[i] = {
                 pic_url,
                 name,
                 representative,
                 capital,
+				capital_type,
                 found_date,
                 id,
               };

pages/index/index.vue

@@ -39,20 +39,20 @@
     </view>
 
     <view class="page-nav-box">
-      <navigator
+	<!-- <navigator
         v-for="(item, index) in navList"
         :key="index"
         :url="item.path"
         open-type="navigate"
         class="nav-content"
       >
-        <image
-          :src="item.url"
-          mode="aspectFit"
-          style="width: 38px; height: 38px"
-        ></image>
+        <image :src="item.url"  mode="aspectFit"  style="width: 38px; height: 38px"></image>
         <view>{{ item.content }}</view>
-      </navigator>
+      </navigator> -->
+	  <view v-for="(item, index) in navList" :key="index" class="nav-content" @click="goOtherPage(item)">
+	    <image :src="item.url"  mode="aspectFit"  style="width: 38px; height: 38px"></image>
+	    <view>{{ item.content }}</view>
+	  </view>
     </view>
 
     <view class="notice-box" style="width:90%;">
@@ -85,7 +85,63 @@
         </view>
       </view>
     </view>
-
+    <view class="notice-box" style="margin-top: 40rpx;width:90%;">
+      <view class="notice-title-box" style="margin: 0 auto;margin-bottom: 30rpx;">
+        <view class="notice-font">区内活动</view>
+        <view class="notice-more-font">
+          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goActive">更多</view>
+          <image
+            src="/static/right-arrow-blue.png"
+            mode="aspectFill"
+            style="width: 12rpx; height: 16rpx"
+          ></image>
+        </view>
+      </view>
+      <view
+        class="notice-content-box"
+        v-for="(item, index) in activityList"
+        :key="index"
+        style="justify-content: start; padding: 30rpx 0 30rpx 30rpx;border-radius: 0;"
+        @click="goActiveDeatil(item.id)" >
+        <image
+          :src="item.url"
+          style="
+            width: 112rpx;
+            height: 112rpx;
+            margin-right: 20rpx;
+            border-radius: 10%;
+          "
+        ></image>
+        <view class="notice-content" style="width: 75%">
+          <view class="notice-content-font">{{
+            item.title
+          }}</view>
+          <view class="display-flex-start" style="margin-top: 20rpx">
+            <view class="notice-content-time display-flex-start color-a7adba"
+              v-show="item.isOnline" style="width: 15%;">
+			  <view class="online-box"></view>线上</view>
+            <view class="notice-content-time display-flex-start color-a7adba"
+              v-show="!item.isOnline" style="width: 15%;">
+			  <view class="offline-box"></view>线下</view>
+            <view class="notice-content-time color-a7adba" style="width: 80%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+				{{item.department}}
+			</view>
+		<!--<view class="notice-content-time color-a7adba">
+				{{item.time}}
+			</view> -->
+          </view>
+          <view class="display-between" style="margin-top: 20rpx">
+			<view class="notice-content-time color-a7adba">
+				{{item.time}}
+			</view>  
+			<view class="display-flex-start">
+				<view class="notice-content-time">浏览 {{ item.browe }}</view>
+				<view class="notice-content-time">分享 {{ item.share }}</view>
+			</view>
+          </view>
+        </view>
+      </view>
+    </view>
     <view class="notice-box" style="margin-top: 40rpx;width: 90%;">
       <view class="notice-title-box">
         <view class="notice-font">推荐园区</view>
@@ -178,9 +234,7 @@
       <view class="notice-title-box" style="margin: 0 auto;margin-bottom: 30rpx;">
         <view class="notice-font">招商专区</view>
         <view class="notice-more-font">
-          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goAttract"
-            >更多</view
-          >
+          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goAttract">更多</view>
           <image
             src="/static/right-arrow-blue.png"
             mode="aspectFill"
@@ -228,67 +282,6 @@
       </view>
     </view>
 
-    <view class="notice-box" style="margin-top: 40rpx;width:90%;">
-      <view class="notice-title-box" style="margin: 0 auto;margin-bottom: 30rpx;">
-        <view class="notice-font">区内活动</view>
-        <view class="notice-more-font">
-          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goActive"
-            >更多</view
-          >
-          <image
-            src="/static/right-arrow-blue.png"
-            mode="aspectFill"
-            style="width: 12rpx; height: 16rpx"
-          ></image>
-        </view>
-      </view>
-
-      <view
-        class="notice-content-box"
-        v-for="(item, index) in activityList"
-        :key="index"
-        style="justify-content: start; padding: 30rpx 0 30rpx 30rpx;border-radius: 0;"
-        @click="goActiveDeatil(item.id)"
-      >
-        <image
-          :src="item.url"
-          style="
-            width: 112rpx;
-            height: 112rpx;
-            margin-right: 20rpx;
-            border-radius: 10%;
-          "
-        ></image>
-        <view class="notice-content" style="width: 75%">
-          <view class="notice-content-font">{{
-            item.title
-          }}</view>
-          <view class="display-flex-start" style="margin-top: 20rpx">
-            <view class="notice-content-time display-flex-start color-a7adba"
-              v-show="item.isOnline" style="width: 15%;">
-			  <view class="online-box"></view>线上</view>
-            <view class="notice-content-time display-flex-start color-a7adba"
-              v-show="!item.isOnline" style="width: 15%;">
-			  <view class="offline-box"></view>线下</view>
-            <view class="notice-content-time color-a7adba" style="width: 80%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-				{{item.department}}
-			</view>
-<!--            <view class="notice-content-time color-a7adba">
-				{{item.time}}
-			</view> -->
-          </view>
-          <view class="display-between" style="margin-top: 20rpx">
-			<view class="notice-content-time color-a7adba">
-				{{item.time}}
-			</view>  
-			<view class="display-flex-start">
-				<view class="notice-content-time">浏览 {{ item.browe }}</view>
-				<view class="notice-content-time">分享 {{ item.share }}</view>
-			</view>
-          </view>
-        </view>
-      </view>
-    </view>
     <foot-tabs :selectedIndex="0" :isShow="footFlag"></foot-tabs>
   </view>
 </template>
@@ -304,7 +297,7 @@ export default {
   },
   data() {
     return {
-      title: "Air企通",
+      title: "爱企通",
       scrollVal: Number,
       footFlag: true,
 	  btnPos:uni.getMenuButtonBoundingClientRect().top + 6,
@@ -486,6 +479,26 @@ export default {
 		  return
 	  }
 	},
+	goOtherPage(item){
+		if(item.content === '发供需'){
+			if(getApp().globalData.globalAuth){
+				uni.navigateTo({
+					url:item.path
+				})
+			}else {
+				uni.showToast({
+				  title: "您还没有登录授权",
+				  duration: 2500,
+				  icon: "none",
+				});
+				return;
+			}
+		}else {
+			uni.navigateTo({
+				url:item.path
+			})
+		}
+	},
     getSwiperList() {
       let md5Sign = md5(
         "method=" +

pages/selfCenter/index.vue

@@ -205,8 +205,10 @@ export default {
               this.userHeadImg = res.data.data.headimg;
               this.userNickName = res.data.data.nickname;
               getApp().globalData.user_phone = res.data.data.phone;
+			  getApp().globalData.globalAuth  = true;
             } else {
               this.isAuth = false;
+			  getApp().globalData.globalAuth  = false;
             }
           }
         },
@@ -270,9 +272,10 @@ export default {
     border-radius: 0rpx 0rpx 100% 100%;
     .img-name-box {
       height: 150rpx;
-      margin-top: 65rpx;
+      margin-top:80rpx;
       display: flex;
       align-items: center;
+	  z-index: 99999;
       .auth-btn {
 		margin-left: 30rpx;
 		margin-top: 20rpx;

pages/service/index.vue

@@ -94,14 +94,14 @@ export default {
 		      "content-type": "application/x-www-form-urlencoded",
 		    },
 		    data: {
-		      s_show:1
+		      s_show:1,
 		    },
 		    success: (res) => {
 		      if (res.data.code === 200) {
 				  res.data.data.list.forEach((item) => {
 				    item.pic_url = getApp().globalData.shareUrl + item.pic_url;
 				  });
-				  this.miniProgramList = res.data.data.list;
+				  this.miniProgramList = (res.data.data.list).sort((a,b)=>{return Number(b.weight) - Number(a.weight)});
 		      }
 		    },
 		    fail: () => {