update

pages/enterprise/enterprise_detail.vue

@@ -31,6 +31,7 @@
               :key="idx"
               class="term-value-item"
               :class="{ blue: item.name == '电话' }"
+              @click="callphone"
             >
               {{ value }}
             </p>
@@ -118,6 +119,11 @@ export default {
     this.getProductInfo(id);
   },
   methods: {
+    callphone(value) {
+      uni.makePhoneCall({
+        phoneNumber: this.info.phone,
+      });
+    },
     change(idx) {
       this.active = idx;
     },
@@ -183,7 +189,7 @@ export default {
               work_range,
             };
             this.model = {
-              title: '',
+              title: "",
               item: [
                 {
                   name: "法定代表人",
@@ -227,8 +233,9 @@ export default {
                 },
               ],
             };
-            getApp().globalData.company_name = name
-            getApp().globalData.company_logo = 'https://kiq.xazhima.com'+pic_url
+            getApp().globalData.company_name = name;
+            getApp().globalData.company_logo =
+              "https://kiq.xazhima.com" + pic_url;
             this.isShow = true;
           }
         },

pages/enterprise/index.vue

@@ -20,7 +20,12 @@
       >
         <view class="title">
           <view class="logo">
-            <img :src="'https://kiq.xazhima.com' + company.pic_url" alt="" />
+            <image
+              :src="'https://kiq.xazhima.com' + company.pic_url"
+              alt=""
+              class="logo-img"
+              mode="aspectFit"
+            />
           </view>
           <view class="name">
             {{ company.name }}
@@ -108,8 +113,14 @@ export default {
           if (res.data.code === 200) {
             let list = res.data.data.list;
             list.forEach((e, i) => {
-              let { pic_url, name, representative, capital, found_date, id } =
-                e;
+              let {
+                pic_url,
+                name,
+                representative,
+                capital,
+                found_date,
+                id,
+              } = e;
               list[i] = {
                 pic_url,
                 name,
@@ -158,8 +169,14 @@ export default {
             let list = res.data.data.list;
             console.log(list);
             list.forEach((e, i) => {
-              let { pic_url, name, representative, capital, found_date, id } =
-                e;
+              let {
+                pic_url,
+                name,
+                representative,
+                capital,
+                found_date,
+                id,
+              } = e;
               list[i] = {
                 pic_url,
                 name,
@@ -221,10 +238,15 @@ export default {
         display: flex;
         align-items: center;
         .logo {
-          image {
-            width: 100rpx;
-            height: 100rpx;
-            margin-right: 30rpx;
+          margin-right: 30rpx;
+          width: 100rpx;
+          height: 100rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          overflow: hidden;
+          .logo-img {
+            max-width: 100%;
           }
         }
       }

pages/notice/notice_deatil.vue

@@ -72,11 +72,27 @@ export default {
         },
       });
     },
+    replaceImg(html) {
+      let result = html.replace(
+        /<img [^>]*src=['"]([^'"]+)[^>]*>/gi,
+        function (match, capture) {
+          return (
+            "<img src=" +
+            getApp().globalData.shareUrl +
+            capture +
+            ' style="max-width:100%;height:auto;display:block;margin:10px 0;"/>'
+          );
+        }
+      );
+      return result;
+    },
     getRich() {
       uni.request({
         url:
           getApp().globalData.shareUrl +
-          `content/notice/${Math.floor(this.model.id / 1000)}/${this.model.id}.html`,
+          `content/notice/${Math.floor(this.model.id / 1000)}/${
+            this.model.id
+          }.html`,
         method: "GET",
         header: {
           "content-type": "application/x-www-form-urlencoded",
@@ -84,7 +100,7 @@ export default {
 
         success: (res) => {
           if (res.statusCode === 200) {
-            this.model.artical = res.data;
+            this.model.artical = this.replaceImg(res.data);
           }
         },
         fail: () => {

pages/policy/index.vue

@@ -19,7 +19,14 @@
     </view>
     <view class="input-box">
       <image src="/static/policy/u377.png" alt="" />
-      <input type="text" placeholder="请输入政策关键词搜索" confirm-type="search" @confirm="searchPoliy()" v-model="searchVal" @focus="search"/>
+      <input
+        type="text"
+        placeholder="请输入政策关键词搜索"
+        confirm-type="search"
+        @confirm="searchPoliy()"
+        v-model="searchVal"
+        @focus="search"
+      />
     </view>
     <view class="policy-box">
       <view class="policy-title"><p>最新政策</p></view>
@@ -42,19 +49,55 @@
           @click="enterPolicyDeatil(item.id)"
         >
           <view class="policy-content-item-left">
-            <p class="policy-content-item-left-title" style="height: 70rpx;">{{ item.title }}</p>
+            <p class="policy-content-item-left-title" style="height: 70rpx">
+              {{ item.title }}
+            </p>
             <view class="policy-content-item-left-time">
               <p class="moment">{{ item.publish_time | globalTime }}</p>
               <p class="maxMony">{{ 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">
-			  剩{{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 &&
+                  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>
             </view>
           </view>
           <view class="policy-content-item-img">
@@ -71,13 +114,13 @@ import md5 from "@/common/md5.js";
 export default {
   data() {
     return {
-      swiperList: [
-      ],
+      swiperList: [],
       policyList: ["省级政策", "市级政策", "区级政策", "新城政策"],
       active: 0,
-	  searchVal:'',
+      searchVal: "",
       policyData: new Array(5).fill({
-        title:"工业金额信息化部办公厅 组织开2021念工业互联网平台创新互联网工业文化产业项目征集工作。",
+        title:
+          "工业金额信息化部办公厅 组织开2021念工业互联网平台创新互联网工业文化产业项目征集工作。",
         moment: "2021-07-12",
         maxMony: "最高500.00万",
         leftDay: "剩5天",
@@ -86,8 +129,8 @@ export default {
     };
   },
   onLoad() {
-	  this.getPolicySwiper()
-	  this.getPolicyList()
+    this.getPolicySwiper();
+    this.getPolicyList();
   },
   methods: {
     search() {
@@ -100,99 +143,105 @@ export default {
         url: "/pages/policy/policy_deatil?id=" + id,
       });
     },
-	changePolicyTabs(idx){
-		let that = this;
-		that.active = idx;
-		switch (idx){
-			case 0:
-			    that.getPolicyList('1')
-				break;
-			case 1:
-				that.getPolicyList('2')
-				break;
-			case 2:
-				that.getPolicyList('3')
-				break;
-			case 3:
-				that.getPolicyList('4')
-				break;			
-		}
-	},
-	getPolicySwiper() {
-	  let md5Sign = md5(
-	    "method=" +
-	      "common" +
-	      "&timestamp=" +
-	      getApp().globalData.globalTimestamp +
-	      "&secret=" +
-	      getApp().globalData.secret
-	  );
-	  let url =
-	    getApp().globalData.shareUrl +
-	    "api/api.php" +
-	    "?method=common&source=policy_pics&action=list&timestamp=" +
-	    getApp().globalData.globalTimestamp +
-	    "&sign=" +
-	    md5Sign;
-	  uni.request({
-	    url: url,
-	    method: "POST",
-	    header: {
-	      "content-type": "application/x-www-form-urlencoded",
-	    },
-	    data: {
-	      order_by: "weight desc",
-	      s_status: 1,
-	      // page: 1,
-	      // page_size: 7,
-	    },
-	    success: (res) => {
-	      console.log(res);
-	      if (res.data.code === 200) {
-	        res.data.data.list.forEach((item) => {
-	          item.pic_path = getApp().globalData.shareUrl + item.pic_path;
-	        });
-	        this.swiperList = res.data.data.list;
-	      }
-	    },
-	    fail: () => {
-	      console.log("连接失败");
-	    },
-	  });
-	},
-	getPolicyList(level) {
-	  let md5Sign = md5(
-	    "method=" +
-	      "common" +
-	      "&timestamp=" +
-	      getApp().globalData.globalTimestamp +
-	      "&secret=" +
-	      getApp().globalData.secret
-	  );
-	  let url = getApp().globalData.shareUrl +"api/api.php" +"?method=common&source=policy&action=list&timestamp=" +getApp().globalData.globalTimestamp +"&sign=" +md5Sign;
-		  uni.request({
-			url: url,
-			method: "POST",
-			header: {
-			  "content-type": "application/x-www-form-urlencoded",
-			},
-			data: {
-			  s_level:level || '1'   //1.省 2.市 3.区 4.新城
-			},
-			success: (res) => {
-			  console.log(res);
-			  if (res.data.code === 200) {
-				  res.data.data.list.forEach((item) => {
-				    item.pic_url = getApp().globalData.shareUrl + item.pic_url;
-				  });
-				  this.policyData = res.data.data.list;
-			  }
-			},
-			fail: () => {
-			  console.log("连接失败");
-			},
-	  });
-	},
+    changePolicyTabs(idx) {
+      let that = this;
+      that.active = idx;
+      switch (idx) {
+        case 0:
+          that.getPolicyList("1");
+          break;
+        case 1:
+          that.getPolicyList("2");
+          break;
+        case 2:
+          that.getPolicyList("3");
+          break;
+        case 3:
+          that.getPolicyList("4");
+          break;
+      }
+    },
+    getPolicySwiper() {
+      let md5Sign = md5(
+        "method=" +
+          "common" +
+          "&timestamp=" +
+          getApp().globalData.globalTimestamp +
+          "&secret=" +
+          getApp().globalData.secret
+      );
+      let url =
+        getApp().globalData.shareUrl +
+        "api/api.php" +
+        "?method=common&source=policy_pics&action=list&timestamp=" +
+        getApp().globalData.globalTimestamp +
+        "&sign=" +
+        md5Sign;
+      uni.request({
+        url: url,
+        method: "POST",
+        header: {
+          "content-type": "application/x-www-form-urlencoded",
+        },
+        data: {
+          order_by: "weight desc",
+          s_status: 1,
+          // page: 1,
+          // page_size: 7,
+        },
+        success: (res) => {
+          console.log(res);
+          if (res.data.code === 200) {
+            res.data.data.list.forEach((item) => {
+              item.pic_path = getApp().globalData.shareUrl + item.pic_path;
+            });
+            this.swiperList = res.data.data.list;
+          }
+        },
+        fail: () => {
+          console.log("连接失败");
+        },
+      });
+    },
+    getPolicyList(level) {
+      let md5Sign = md5(
+        "method=" +
+          "common" +
+          "&timestamp=" +
+          getApp().globalData.globalTimestamp +
+          "&secret=" +
+          getApp().globalData.secret
+      );
+      let url =
+        getApp().globalData.shareUrl +
+        "api/api.php" +
+        "?method=common&source=policy&action=list&timestamp=" +
+        getApp().globalData.globalTimestamp +
+        "&sign=" +
+        md5Sign;
+      uni.request({
+        url: url,
+        method: "POST",
+        header: {
+          "content-type": "application/x-www-form-urlencoded",
+        },
+        data: {
+          s_level: level || "1", //1.省 2.市 3.区 4.新城
+        },
+        success: (res) => {
+          console.log(res);
+          if (res.data.code === 200) {
+            res.data.data.list.forEach((item) => {
+              item.pic_url = getApp().globalData.shareUrl + item.pic_url;
+            });
+            this.policyData = res.data.data.list;
+          }
+        },
+        fail: () => {
+          console.log("连接失败");
+        },
+      });
+    },
   },
 };
 </script>
@@ -215,8 +264,8 @@ export default {
     image {
       position: absolute;
       left: 72rpx;
-	  width: 30rpx;
-	  height: 30rpx;
+      width: 30rpx;
+      height: 30rpx;
     }
     input {
       background-color: #ffffff;
@@ -267,7 +316,7 @@ export default {
       display: flex;
       box-sizing: border-box;
       flex-direction: column;
-	  margin-top: 10rpx;
+      margin-top: 10rpx;
       .policy-content-item {
         margin: 0 20rpx;
         display: flex;

pages/supply/index.vue

@@ -118,6 +118,7 @@ export default {
                 }),
                 
        */
+            console.log(list);
             this.supplyList = list.map((item) => {
               let ob = {
                 image: "",
@@ -137,7 +138,7 @@ export default {
               ob.image = item.url;
               return ob;
             });
-            console.log(res.data.data.list);
+            // console.log(res.data.data.list);
           }
         },
         fail: () => {

pages/supply/mySupply.vue

@@ -29,12 +29,12 @@
             <view class="time">发布时间：{{ supply.time }}</view>
           </view>
           <view class="state">
-            <image src="/static/appeal/waited.svg" v-if="supply.state == 1" />
+         
             <image
               src="/static/supply/u1830.png"
-              v-else-if="supply.state == -1"
+              v-if="supply.state == -1"
             />
-            <image src="/static/supply/u1829.png" v-else />
+            <image src="/static/supply/u1829.png"   v-if="supply.state == 0" />
           </view>
         </view>
       </view>
@@ -184,6 +184,7 @@ export default {
       font-size: 25rpx;
       .supplyCard {
         display: flex;
+        align-items: center;
         width: 92%;
         margin: 2% 0;
         padding: 2% 4%;

pages/supply/putSupply.vue

@@ -312,6 +312,8 @@ export default {
     box-shadow: rgba(100, 100, 111, 0.2) 14rpx 14rpx 40rpx 14rpx;
     .area {
       height: 200rpx;
+      padding: 20rpx;
+    box-sizing: border-box;
     }
     .picker {
       width: 80%;
@@ -336,7 +338,7 @@ export default {
           border-left: 15rpx solid transparent;
           border-right: 15rpx solid transparent;
           position: absolute;
-          right: 0;
+          right: 10rpx;
         }
         .pickername {
           font-weight: 100;

pages/supply/supply_detail.vue

@@ -15,9 +15,8 @@
       <view class="view">
         <span class="label">图片：</span>
         <view class="flex">
-          <image :src="image" />
-          <image :src="image" />
-          <image :src="image" />
+          <view v-if="imageList.length == 0">-</view>
+          <image :src="item.url" v-for="item in imageList" :key="item.id" />
         </view>
       </view>
       <view class="view">
@@ -53,7 +52,7 @@ export default {
       title: "",
       details: "",
       type: "",
-      image: "",
+      imageList: [],
       time: "",
       info: {
         name: "",
@@ -111,7 +110,11 @@ export default {
             this.time = time + " " + timeSecond;
             this.info.name = data.company_name;
             this.info.code = data.company_code;
-            this.info.tel = data.phone
+            this.info.tel = data.phone;
+            this.imageList = data.attach_list.map((item) => {
+              item.url = getApp().globalData.shareUrl + item.url;
+              return item;
+            });
           }
         },
         fail: () => {