修改样式问题

pages/activity/index.vue

@@ -108,15 +108,15 @@ export default {
         },
         {
           label: "待开始",
-          value: 0,
+          value: '0',
         },
         {
           label: "已开始",
-          value: 1,
+          value: '1',
         },
         {
           label: "已结束",
-          value: 2,
+          value: '2',
         },
       ],
       activeList: [
@@ -150,7 +150,7 @@ export default {
   },
   methods: {
     bindPickerChange(e, op) {
-      console.log(e.detail.value);
+      console.log(e.detail);
       switch (op) {
         case "type":
           this.indexType = e.detail.value;
@@ -170,10 +170,17 @@ export default {
         */
       let type = this.indexType;
       let state = this.indexState;
+	  let stateObj = {
+		  '0' : '全部',
+		  '1' : '待开始',
+		  '2' : '已开始',
+		  '3' : '已结束'
+	  }
+	  state = stateObj[state]
       this.activeListCopy = this.activeList.filter((item) => {
         return (
           (type == 0 || item.type == type) &&
-          (state == 0 || item.status == state - 1)
+          (state == '全部' || item.status == state)
         );
       });
     },

pages/enterprise/enterprise_detail.vue

@@ -3,7 +3,7 @@
     <view class="title">
       <view class="logo">
         <image
-          :src="'https://kiq.xazhima.com' + info.pic_url"
+          :src="globalUrl + info.pic_url"
           alt="" class="logo-img"
           mode="aspectFit"
         ></image>
@@ -78,7 +78,7 @@
               :src="
                 item.pic_url
                   ? globalUrl + item.pic_url
-                  : '/static/enterprise/default.webp'
+                  : '/static/nodata.svg'
               "
               mode="aspectFit"
             ></image>
@@ -477,7 +477,7 @@ export default {
   .proInfo {
     font-size: 25rpx;
     .products {
-      width: 100%;
+      // width: 100%;
       display: flex;
       padding: 4%;
       flex-wrap: wrap;

pages/enterprise/product_detail.vue

@@ -8,7 +8,9 @@
         {{ name }}
       </div>
     </div>
-    <div class="fwb" v-html="company"></div>
+    <div class="fwb" v-html="company">
+		<u-parse :content="company"/>
+	</div>
     <!-- <div style="width: 100%">
       <footer-share
         style="width: 100%"
@@ -20,7 +22,11 @@
   </div>
 </template>
 <script>
+import uParse from '@/components/gaoyia-parse/parse.vue'	
 export default {
+  components: {
+		uParse
+	},
   onLoad(option) {
     this.getRich(option.id);
   },
@@ -36,12 +42,20 @@ export default {
       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;"/>'
-          );
+		  if(capture.includes('http')){
+			  return (
+				"<img src=" +
+				capture +
+				' style="max-width:100%;height:auto;display:block;margin:10px 0;"/>'
+			  );
+		  }else {
+			return (
+			  "<img src=" +
+			  getApp().globalData.shareUrl +
+			  capture +
+			  ' style="max-width:100%;height:auto;display:block;margin:10px 0;"/>'
+			);
+		  }	
         }
       );
       return result;

pages/index/index.vue

@@ -57,7 +57,7 @@
       <view class="notice-title-box">
         <view class="notice-font">通知公告</view>
         <view class="notice-more-font">
-          <view style="margin-right: 8rpx; font-size: 22rpx" @click="goNotice"
+          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goNotice"
             >更多</view
           >
           <image
@@ -77,13 +77,13 @@
         <image
           :src="item.icon"
           mode="aspectFit"
-          style="width: 34px; height: 34px"
+          style="width:80rpx; height:80rpx"
         ></image>
-        <view class="notice-content display-around-column" style="width: 88%">
-          <view class="notice-content-font" style="margin-left: 40rpx">{{
+        <view class="notice-content display-around-column" style="width: 85%">
+          <view class="notice-content-font" style="margin-left: 30rpx">{{
             item.title
           }}</view>
-          <view class="notice-content-time" style="margin-left: 40rpx">{{
+          <view class="notice-content-time" style="margin-left: 30rpx">{{
             item.publish_time | globalTime
           }}</view>
         </view>
@@ -98,7 +98,7 @@
           url="../park/index"
           open-type="navigate"
         >
-          <view style="margin-right: 8rpx; font-size: 22rpx">更多</view>
+          <view style="margin-right: 8rpx; font-size:26rpx">更多</view>
           <image
             src="/static/right-arrow-blue.png"
             mode="aspectFill"
@@ -165,11 +165,11 @@
                     class="park-footer-img"
                   ></image>
                   {{ item.cover_area
-                  }}<text style="font-size: 12rpx">亩</text></view
+                  }}<text style="font-size: 14rpx">亩</text></view
                 >
                 <view class="park-footer-font">占地面积</view>
               </view>
-              <view class="display-between-column width-30">
+              <view class="display-between-column" style="width: 33%;">
                 <view class="display-flex-start">
                   <image
                     src="/static/park/park-area2.png"
@@ -177,7 +177,7 @@
                     class="park-footer-img"
                   ></image>
                   {{ item.building_area
-                  }}<text style="font-size: 12rpx">万㎡</text></view
+                  }}<text style="font-size: 14rpx">万㎡</text></view
                 >
                 <view class="park-footer-font">建设面积</view>
               </view>
@@ -191,7 +191,7 @@
       <view class="notice-title-box">
         <view class="notice-font">招商专区</view>
         <view class="notice-more-font">
-          <view style="margin-right: 8rpx; font-size: 22rpx" @click="goAttract"
+          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goAttract"
             >更多</view
           >
           <image
@@ -227,13 +227,13 @@
           <view class="attract-content">{{ item.desc }}</view>
           <view
             class="notice-content-time"
-            style="margin-top: 20rpx; font-size: 20rpx"
+            style="margin-top: 20rpx; font-size: 26rpx"
             v-if="item.time_type == 1"
             >{{ item.time | globalTime }}</view
           >
           <view
             class="notice-content-time"
-            style="margin-top: 20rpx; font-size: 20rpx"
+            style="margin-top: 20rpx; font-size: 26rpx"
             v-else
             >时间：待定</view
           >
@@ -245,7 +245,7 @@
       <view class="notice-title-box">
         <view class="notice-font">区内活动</view>
         <view class="notice-more-font">
-          <view style="margin-right: 8rpx; font-size: 22rpx" @click="goActive"
+          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goActive"
             >更多</view
           >
           <image
@@ -853,13 +853,13 @@ export default {
   flex-direction: column;
   align-items: center;
   margin-top: 20rpx;
-  font-size: 22rpx;
+  font-size: 28rpx;
   justify-content: space-around;
   letter-spacing: 0.02em;
   color: #0d1937;
   font-family: PingFang SC;
   font-style: normal;
-  font-weight: 600;
+  /* font-weight: 600; */
 }
 .notice-box {
   width: 83%;
@@ -877,12 +877,12 @@ export default {
   font-family: PingFang SC;
   font-style: normal;
   font-weight: 600;
-  font-size: 32rpx;
+  font-size: 36rpx;
   letter-spacing: 0.02em;
   color: #0d1937;
 }
 .notice-more-font {
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #146afb;
   display: flex;
   align-items: center;
@@ -909,19 +909,19 @@ export default {
   align-items: center;
   justify-content: center;
   color: #fff;
-  font-size: 28rpx;
+  font-size: 32rpx;
   font-weight: bold;
 }
 .notice-content-font {
-  font-size: 26rpx;
+  font-size: 32rpx;
   color: #0d1937;
-  font-weight: 600;
+  /* font-weight: 600; */
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 .notice-content-time {
-  font-size: 18rpx;
+  font-size: 26rpx;
   letter-spacing: 0.02em;
   color: #cfcfcf;
   margin-right: 14rpx;
@@ -938,19 +938,19 @@ export default {
   border-radius: 56rpx 0px 32rpx 32rpx;
   position: absolute;
   top: 210rpx;
-  font-size: 24rpx;
+  font-size: 30rpx;
   padding: 30rpx;
   box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.1);
 }
 .park-title {
-  font-weight: 600;
+  /* font-weight: 600; */
   line-height: 36rpx;
   letter-spacing: 0.02em;
   color: #0d1937;
 }
 .park-address {
-  font-weight: 600;
-  font-size: 19rpx;
+  /* font-weight: 600; */
+  font-size: 26rpx;
   letter-spacing: 0.02em;
   color: #cfcfcf;
   margin-top: 10rpx;
@@ -970,7 +970,7 @@ export default {
 }
 .park-footer-font {
   color: #cfcfcf;
-  font-size: 19rpx;
+  font-size: 24rpx;
   margin-top: 10rpx;
 }
 .width-30 {
@@ -978,8 +978,8 @@ export default {
 }
 .attract-content {
   color: #697594;
-  font-weight: 600;
-  font-size: 20rpx;
+  /* font-weight: 600; */
+  font-size: 24rpx;
   margin-top: 8rpx;
   overflow: hidden;
   text-overflow: ellipsis;

pages/park/map_search.vue

@@ -5,7 +5,7 @@
 		<cover-view class="map-pop-box" v-show="isShowPop" @click="goParkDetail()">
 			<cover-view class="display-between">
 				<cover-view class="pop-title">{{popInfo.name}}</cover-view>
-				<cover-image src="/static/park/location2.png" style='width:50rpx;height:50rpx;'></cover-image>
+				<cover-image src="/static/selfCenter/back.png" style='width:50rpx;height:50rpx;'></cover-image>
 			</cover-view>
 			<cover-view class="display-flex-start" style="margin-bottom: 10rpx;">
 				<cover-view class="pop-subtitle">入驻企业:</cover-view>
@@ -169,6 +169,7 @@
 		width: 20%;
 	}
 	.pop-value {
+		width: 75%;
 		font-size: 22rpx;
 		color: #0D1937;
 		white-space: break-spaces;