修改问题bug

pages/activity/index.vue

@@ -57,13 +57,13 @@
           </div>
         </div>
         <div class="readShare">
-          <div v-show="active.status == '0'" class="active-tips-box wait-color">
+          <div v-show="active.status == '待开始'" class="active-tips-box wait-color">
             活动待开始
           </div>
-          <div v-show="active.status == '1'" class="active-tips-box ing-color">
+         <div v-show="active.status == '已开始'" class="active-tips-box ing-color">
             活动进行中
           </div>
-          <div v-show="active.status == '2'" class="active-tips-box end-color">
+          <div v-show="active.status == '已结束'" class="active-tips-box end-color">
             活动已结束
           </div>
           <div class="read">浏览 {{ active.read }}</div>
@@ -185,7 +185,7 @@ export default {
     getActive() {
       let md5Sign = md5(
         "method=" +
-          "common" +
+          "activity" +
           "&timestamp=" +
           getApp().globalData.globalTimestamp +
           "&secret=" +
@@ -194,13 +194,14 @@ export default {
       let url =
         getApp().globalData.shareUrl +
         "api/api.php" +
-        "?method=common&source=activity&action=list&timestamp=" +
+        "?method=activity&source=activity&action=list&timestamp=" +
         getApp().globalData.globalTimestamp +
         "&sign=" +
         md5Sign;
       let postData = {
-        page: 1,
-        page_size: 15,
+        // page: 1,
+        // page_size: 15,
+		 s_cancel : 0
       };
       uni.request({
         url: url,
@@ -276,10 +277,10 @@ export default {
     padding: 20rpx 0;
     width: 100%;
     display: flex;
-    position: fixed;
+    // position: fixed;
     height: 50rpx;
     top: 0;
-    margin-bottom: 50rpx;
+    // margin-bottom: 50rpx;
     .type,
     .state {
       width: 50%;
@@ -314,7 +315,7 @@ export default {
   }
   .actives {
     width: 90%;
-    margin-top: 50rpx;
+    // margin-top: 50rpx;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -323,7 +324,7 @@ export default {
       // height: 150rpx;
       box-shadow: 0px 4rpx 32rpx rgba(0, 0, 0, 0.1);
       border-radius: 32rpx;
-      margin-top: 20px;
+      // margin-top: 20px;
       padding: 20rpx;
       display: flex;
       flex-direction: column;
@@ -348,10 +349,15 @@ export default {
           justify-content: space-between;
           .right-title {
             width: 100%;
-            margin-bottom: 20rpx;
+            margin-bottom:15rpx;
             font-size: 27rpx;
             font-weight: 600;
             letter-spacing: 3rpx;
+			overflow: hidden;
+		    -webkit-line-clamp: 2;
+		    text-overflow: ellipsis;
+		    display: -webkit-box;
+		    -webkit-box-orient: vertical;
           }
           .right-inf {
             flex-wrap: wrap;

pages/enterprise/index.vue

@@ -99,7 +99,7 @@ export default {
         "&sign=" +
         md5Sign;
       let postData = {
-        s_show: "1",
+        s_pub: "1",
       };
       uni.request({
         url: url,

pages/index/index.vue

@@ -577,8 +577,8 @@ export default {
         data: {
           // order_by: "weight desc",
           // s_show: 1,
-          // page: 1,
-          // page_size: 5,
+          page: 1,
+          page_size:3,
         },
         success: (res) => {
           if (res.data.code === 200) {
@@ -601,6 +601,7 @@ export default {
               return item;
             });
           }
+		  console.log(this.noticeList)
         },
         fail: () => {
           console.log("连接失败");
@@ -669,6 +670,7 @@ export default {
       let postData = {
         page: 1,
         page_size: 2,
+		s_cancel : 0
       };
       uni.request({
         url: url,

pages/policy/index.vue

@@ -18,15 +18,15 @@
       </swiper>
     </view>
     <view class="input-box">
-      <image src="/static/policy/u377.png" alt="" />
+      <image src="/static/policy/u377.png" alt="" mode="aspectFit" @click="searchPolicy(searchVal)"/>
       <input
         type="text"
         placeholder="请输入政策关键词搜索"
         confirm-type="search"
-        @confirm="searchPoliy()"
+        @confirm="searchPolicy(searchVal)"
         v-model="searchVal"
-        @focus="search"
       />
+	   <!-- @focus="search" -->
     </view>
     <view class="policy-box">
       <view class="policy-title"><p>最新政策</p></view>
@@ -134,10 +134,15 @@ export default {
   },
   methods: {
     search() {
-      uni.redirectTo({
-        url: "./search",
+      uni.navigateTo({
+         url: "./search?val=" + this.searchVal,
       });
     },
+	searchPolicy(val) {
+	  uni.navigateTo({
+	  	 url: "./search?val=" + val,
+	  })
+	},
     enterPolicyDeatil(id) {
       uni.navigateTo({
         url: "/pages/policy/policy_deatil?id=" + id,

pages/policy/search.vue

@@ -1,10 +1,10 @@
 <template>
   <view class="content">
     <view class="input-box">
-      <image src="/static/policy/u377.png" alt="" />
-      <input type="text" placeholder="请输入政策关键词搜索" confirm-type="search" @confirm="searchPoliy()" v-model="searchVal"/>
+      <image src="/static/policy/u377.png" alt=""  @click="searchPolicy(searchVal)"/>
+      <input type="text" placeholder="请输入政策关键词搜索" confirm-type="search" @confirm="searchPolicy()" v-model="searchVal"/>
     </view>
-    <view class="policy-box">
+     <view class="policy-box">
       <view class="policy-content">
         <view
           class="policy-content-item"
@@ -26,6 +26,7 @@
         </view>
       </view>
     </view>
+     <image src="../../static/nodata.svg" mode="aspectFit" style="width: 100%;" v-if="policyData.length === 0"></image> 
   </view>
 </template>
 
@@ -35,17 +36,25 @@ export default {
   data() {
     return {
       active: 0,
-	    searchVal:'',
+	  searchVal:'',
       policyData: [],
     };
   },
+  onLoad(option) {
+	 if(option.val){
+	   this.searchPolicy(option.val) 
+	 } 
+  },
+ //  onBackPress(event){
+	//  uni.navigateBack();
+	// },
   methods: {
     enterPolicyDeatil(id) {
       uni.navigateTo({
         url: "/pages/policy/policy_deatil?id=" + id,
       });
     },
-	searchPoliy(){
+	searchPolicy(val){
 		let md5Sign = md5(
 		  "method=" +
 		    "common" +
@@ -62,12 +71,11 @@ export default {
 				  "content-type": "application/x-www-form-urlencoded",
 				},
 				data: {
-				  ss_content_text:this.searchVal   //1.省 2.市 3.区 4.新城
+				  ss_content_text:val || this.searchVal   //1.省 2.市 3.区 4.新城
 				},
 				success: (res) => {
           if (res.data.code === 200) {
             this.policyData = res.data.data.list
-            console.log(res.data.data.list);
 				  }
 				},
 				fail: () => {

pages/selfCenter/my_activity.vue

@@ -29,15 +29,18 @@
         </div>
       </div>
       <div class="readShare">
-        <div v-show="active.status == '0'" class="active-tips-box wait-color">
-          活动待开始
-        </div>
-        <div v-show="active.status == '1'" class="active-tips-box ing-color">
-          活动进行中
-        </div>
-        <div v-show="active.status == '2'" class="active-tips-box end-color">
-          活动已结束
-        </div>
+		 <div v-show="active.status == '待开始'" class="active-tips-box wait-color">
+			活动待开始
+		  </div>
+		 <div v-show="active.status == '已开始'" class="active-tips-box ing-color">
+			活动进行中
+		  </div>
+		  <div v-show="active.status == '已结束'" class="active-tips-box end-color">
+			活动已结束
+		  </div>
+		  <div v-show="active.status == '已取消'" class="active-tips-box end-color">
+			 活动已取消
+		   </div>
         <div class="read">浏览 {{ active.read }}</div>
         <div class="share">分享 {{ active.share }}</div>
       </div>

pages/supply/index.vue

@@ -132,10 +132,10 @@ export default {
               );
               ob.time = time + " " + timeSecond;
               ob.state = item.type;
-              ob.image = "/static/nodata.svg";
-              // ob.image = item.attach_list[0]
-              //   ? getApp().globalData.shareUrl + item.attach_list[0].url
-              //   : "/static/nodata.svg";
+           //   ob.image = "/static/nodata.svg";
+              ob.image = item.attach_list[0]
+                ? getApp().globalData.shareUrl + item.attach_list[0]
+                : "/static/nodata.svg";
               return ob;
             });
             // console.log(res.data.data.list);

pages/supply/supply_detail.vue

@@ -16,7 +16,7 @@
         <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"/>
+          <image :src="item.url" v-for="item in imageList" :key="item.id" mode="aspectFit" @click="showlarge(item.url)"/>
         </view>
       </view>
       <view class="view">
@@ -66,6 +66,18 @@ export default {
     this.getSupplyDeatil();
   },
   methods: {
+	showlarge(src){
+		uni.previewImage({
+		  urls: [src],
+		  longPressActions: {
+		    itemList: ["发送给朋友", "保存图片"],
+		    success: function (data) {},
+		    fail: function (err) {
+		      console.log(err.errMsg);
+		    },
+		  },
+		});
+	},
     getSupplyDeatil() {
       let md5Sign = md5(
         "method=" +