瀏覽代碼

更新版本

wzz 4 年之前
父節點
當前提交
8419164be7
共有 7 個文件被更改,包括 20 次插入17 次删除
  1. 2 3
      App.vue
  2. 1 1
      manifest.json
  3. 4 4
      pages/activity/activity_deatil.vue
  4. 2 2
      pages/activity/index.vue
  5. 3 3
      pages/index/index.vue
  6. 4 2
      pages/policy/index.vue
  7. 4 2
      pages/policy/search.vue

+ 2 - 3
App.vue

@@ -2,9 +2,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,

+ 1 - 1
manifest.json

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

+ 4 - 4
pages/activity/activity_deatil.vue

@@ -411,10 +411,10 @@ export default {
 		let that = this;
 		uni.requestSubscribeMessage({
 		  tmplIds: [
-		    "bSg5tUWHE4qWDeyK31GBejogT1uRgkuBD1_n2I5ptAc",
-		    "T_ORLiW2C_UM6nZiEerYAokltHgHRGxWCid8eElujus",
-		  // "XPULJQ64YrS-5sAnfMTJj3S9iV8-8X_mb3r_H5dgAgE",
-		  // "RWq7TE266RYr8DX2IHZ2F_zKbOnSfZDgh_xovBh0UiI" 		//测试环境模板id
+		    // "bSg5tUWHE4qWDeyK31GBejogT1uRgkuBD1_n2I5ptAc",
+		    // "T_ORLiW2C_UM6nZiEerYAokltHgHRGxWCid8eElujus",
+		  "XPULJQ64YrS-5sAnfMTJj3S9iV8-8X_mb3r_H5dgAgE",
+		   "RWq7TE266RYr8DX2IHZ2F_zKbOnSfZDgh_xovBh0UiI" 		//测试环境模板id
 		  ],
 		  success(res) {
 		    that.signUpActivity(info);

+ 2 - 2
pages/activity/index.vue

@@ -59,7 +59,7 @@
         <div class="readShare">
           <div v-show="active.status == '待开始'" class="active-tips-box wait-color">
              <!-- 活动待开始 -->
-			{{timeStatus}}开始
+			{{timeStatus}}开始
           </div>
          <div v-show="active.status == '已开始'" class="active-tips-box ing-color">
             活动进行中
@@ -253,7 +253,7 @@ export default {
             //  let timeSecond = this.$options.filters["globalTime"](item.end_time);
 			  let timeEnd = this.$options.filters["globalTime"](item.end_time) + ' ' + this.$options.filters["globalTimeSecond"](item.end_time);
               ob.date = timeStart + " 至 " + timeEnd;
-			  this.timeStatus = timeStart.substr(5,5);
+			  this.timeStatus = timeStart.substr(5,5).replace('-', '月').replace(/0/g,'');
               ob.read = parseInt(item.base_read_count) + parseInt(item.real_read_count);
               ob.share = parseInt(item.real_repost_count) + parseInt(item.base_repost_count);
               ob.type = item.type;

+ 3 - 3
pages/index/index.vue

@@ -87,7 +87,7 @@
     </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-font">新城活动</view>
         <view class="notice-more-font">
           <view style="margin-right: 8rpx; font-size: 26rpx" @click="goActive">更多</view>
           <image
@@ -230,7 +230,7 @@
       </view>
     </view>
 
-    <view class="notice-box" style="margin-top: 20rpx;width: 90%;">
+<!--    <view class="notice-box" style="margin-top: 20rpx;width: 90%;">
       <view class="notice-title-box" style="margin: 0 auto;margin-bottom: 30rpx;">
         <view class="notice-font">招商专区</view>
         <view class="notice-more-font">
@@ -280,7 +280,7 @@
           >
         </view>
       </view>
-    </view>
+    </view> -->
 
     <foot-tabs :selectedIndex="0" :isShow="footFlag"></foot-tabs>
   </view>

+ 4 - 2
pages/policy/index.vue

@@ -49,13 +49,14 @@
             <view class="policy-content-item-left-time" v-if="item.level != '5'">
               <p class="moment">{{ item.publish_time | globalTime }}</p>
               <p class="maxMony" v-if="item.project_money!=='-' && item.project_money ">{{ item.project_money }}</p>
-              <p class="leftDay" v-if=" item.project_end_date && Math.floor( new Date( new Date(item.project_end_date).getTime() -new Date().getTime() ).getTime() /(1 * 24 * 60 * 60 * 1000) ) +1 >= 1">
+              <p class="leftDay" v-if=" item.project_end_date && Math.floor( new Date( new Date(item.project_end_date).getTime() -new Date().getTime()).getTime() /(1 * 24 * 60 * 60 * 1000) ) +1 >= 1">
                 剩{{ Math.floor(new Date(new Date(item.project_end_date).getTime() -new Date().getTime()).getTime() /(1 * 24 * 60 * 60 * 1000)) + 1}}天
               </p>
               <p class="leftDay"  v-if="item.project_end_date && Math.floor(new Date(new Date(item.project_end_date).getTime() - new Date().getTime()).getTime() / (1 * 24 * 60 * 60 * 1000)) + 1 < 1 ">
                 申报结束
               </p>
-              <p class="leftDay" v-if="!item.project_end_date">长期可申报</p>
+             <p class="leftDay" v-if="!item.project_end_date">长期可申报</p>
+			  <!-- <p class="leftDay" v-if="!item.project_end_date">剩{{ Math.floor(new Date(new Date().getTime() - new Date(item.publish_time * 1000).getTime()).getTime() /(1 * 24 * 60 * 60 * 1000)) + 1}}天</p> -->
             </view>
 			<view class="policy-content-item-left-time" v-if="item.level == '5'">
 			  <p class="moment">{{ item.publish_time | globalTime }}</p>
@@ -192,6 +193,7 @@ export default {
         },
         data: {
           s_level: level || "4", //1.省 2.市 3.区 4.新城 5.解读
+		  order_by : 'project_sort_time asc'
         },
         success: (res) => {
           console.log(res);

+ 4 - 2
pages/policy/search.vue

@@ -19,7 +19,8 @@
               <p class="leftDay"  v-if="item.project_end_date && Math.floor(new Date(new Date(item.project_end_date).getTime() - new Date().getTime()).getTime() / (1 * 24 * 60 * 60 * 1000)) + 1 < 1 ">
                 申报结束
               </p>
-              <p class="leftDay" v-if="!item.project_end_date">长期可申报</p>
+            <p class="leftDay" v-if="!item.project_end_date">长期可申报</p>
+			  <!-- <p class="leftDay" v-if="!item.project_end_date">剩{{ Math.floor(new Date(new Date().getTime() - new Date(item.publish_time * 1000).getTime()).getTime() /(1 * 24 * 60 * 60 * 1000)) + 1}}天</p> -->
             </view>
 		    <view class="policy-content-item-left-time" v-if="item.level == '5'">
 				<p class="moment">{{ item.publish_time | globalTime }}</p>
@@ -75,7 +76,8 @@ export default {
 				  "content-type": "application/x-www-form-urlencoded",
 				},
 				data: {
-				  ss_content_text:val || this.searchVal   //1.省 2.市 3.区 4.新城
+				  ss_content_text:val || this.searchVal,//1.省 2.市 3.区 4.新城 5.解读
+				  order_by : 'project_sort_time asc'
 				},
 				success: (res) => {
           if (res.data.code === 200) {