306132416@qq.com hace 4 años
padre
commit
dbba61d7f6

+ 3 - 0
App.vue

@@ -74,6 +74,9 @@ export default {
 <style>
 /*每个页面公共css */
 @import url("/components/gaoyia-parse/parse.css");
+page {
+	height: 100%;
+}
 .display-flex-start {
   display: flex;
   align-items: center;

+ 14 - 1
components/artical-deatil/index.vue

@@ -9,7 +9,8 @@
         </view>
       </view>
       <view class="artical">
-        <view v-html="model.artical"></view>
+        <!-- <view v-html="model.artical"></view> -->
+		<u-parse :content="model.artical"  @navigate="navigateUrl" />
       </view>
     </view>
     <view class="footer">
@@ -28,6 +29,7 @@
 <script>
 import md5 from "@/common/md5.js";
 import FooterShare from "../footer-share/footer-share.vue";
+import uParse from '@/components/gaoyia-parse/parse.vue'
 export default {
   props: {
     model: {
@@ -41,6 +43,7 @@ export default {
   },
   components: {
     FooterShare,
+	uParse
   },
   data() {
     return {
@@ -54,6 +57,16 @@ export default {
     };
   },
   methods: {
+	  navigateUrl(href, e) {
+	  	uni.setClipboardData({
+	  		data:href,//要被复制的内容
+	  		success:()=>{//复制成功的回调函数
+	  		  uni.showToast({//提示
+	  			title:'复制成功'
+	  		  })
+	  		}
+	  	  });
+	  },
     sharePage() {
     let that = this;
     console.log('点击分享');

+ 1 - 1
pages/activity/activity_deatil.vue

@@ -285,7 +285,7 @@ export default {
     subscribeActivity(status) {
       if (this.model.person_count >= this.model.max_person) {
         uni.showToast({
-          title: "报名人数已上限",
+          title: "报名人数已上限",
           icon: "error",
           duration: 2000,
         });

+ 8 - 2
pages/activity/index.vue

@@ -242,7 +242,7 @@ export default {
               let timeSecond = this.$options.filters["globalTime"](
                 item.end_time
               );
-              ob.date = time + "至" + timeSecond;
+              ob.date = time + "  " + timeSecond;
               ob.read =
                 parseInt(item.base_read_count) + parseInt(item.real_read_count);
               ob.share =
@@ -408,8 +408,14 @@ export default {
           background-color: #d7d7d7;
         }
         .read {
-          margin-right: 60rpx;
+			width: 20%;
+			text-align: center;
+          // margin-right: 60rpx;
         }
+		.share {
+			width: 20%;
+			text-align: center;
+		}
       }
     }
   }

+ 1 - 1
pages/appeal/putAppeal.vue

@@ -89,7 +89,7 @@ export default {
         return;
       }
       uni.chooseImage({
-        sourceType: [type],
+        // sourceType: [type],
         count: 3 - that.uploadList.length,
         sizeType: ["original", "compressed"], //可以指定是原图还是压缩图,默认二者都有
         success: (res) => {

+ 2 - 2
pages/auth/index.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="auth">
 		
-		<image src="/static/logo.png" mode="aspectFill"></image>
+		<image src="/static/logo.jpg" mode="aspectFill"></image>
 		
-		<text class="margin-top-3 auth-title">欢迎使用空i企小程序</text>
+		<text class="margin-top-3 auth-title">欢迎使用Air企通小程序</text>
 		
 		<text class="margin-top-3 auth-content">此页面是微信授权页面,授权之后你可以获取更优质的服务,您的隐私将会受到保护</text>
 		

+ 4 - 1
pages/index/index.vue

@@ -449,7 +449,10 @@ export default {
 	this.getActive();
   },
   onLoad() {
-	uni.showLoading({});  
+	uni.showLoading({
+	  title: "加载中",
+	  mask: true,
+	}); 
     this.getSwiperList();
     this.getPark();
     this.getNotice();

+ 4 - 2
pages/policy/policy_deatil.vue

@@ -112,7 +112,8 @@
       <div class="item-list">
         <div class="term">
           <div class="term-value-group">
-            <p class="term-value-item" v-html="textModel1.text"></p>
+            <!-- <p class="term-value-item" v-html="textModel1.text"></p> -->
+			<u-parse :content="textModel1.text"  @navigate="navigateUrl" />
           </div>
         </div>
       </div>
@@ -133,7 +134,8 @@
       <div class="item-list">
         <div class="term">
           <div class="term-value-group">
-            <p class="term-value-item" v-html="textModel3.text"></p>
+          <!--  <p class="term-value-item" v-html="textModel3.text"></p> -->
+			<u-parse :content="textModel3.text"  @navigate="navigateUrl" />
           </div>
         </div>
       </div>

+ 17 - 5
pages/policy/policy_rich_card.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="card-situation">
     <div class="card-title">{{ model.title }}</div>
-    <div
-      v-html="model.text"
-      class="card-text"
-      :class="{ isfold: isfold }"
-    ></div>
+    <div class="card-text"  :class="{ isfold: isfold }">
+		<u-parse :content="model.text"  @navigate="navigateUrl" />
+	</div>
     <div class="fold" v-if="isFold && localIsFold" @click="changeFoldState">
       点击{{ foldText }}
     </div>
@@ -13,7 +11,11 @@
 </template>
 
 <script>
+import uParse from '@/components/gaoyia-parse/parse.vue'	
 export default {
+	components: {
+		uParse
+	},
   props: ["model", "isFold"],
   data() {
     return {
@@ -49,6 +51,16 @@ export default {
     },
   },
   methods: {
+	  navigateUrl(href, e) {
+	  	uni.setClipboardData({
+	  		data:href,//要被复制的内容
+	  		success:()=>{//复制成功的回调函数
+	  		  uni.showToast({//提示
+	  			title:'复制成功'
+	  		  })
+	  		}
+	  	  });
+	  },
     changeFoldState() {
       let poor = 0,
         Bheight = 0,

+ 4 - 4
pages/service/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="content">
     <view class="banner">
-      <image :src="bannerSrc" alt="banner" />
+      <image :src="bannerSrc" alt="banner" mode="aspectFill"/>
     </view>
     <div class="menus">
       <div class="menu" v-for="(item,index) in miniProgramList" :key="index" @click="toDetail(item)">
@@ -129,11 +129,10 @@ export default {
   display: flex;
 }
 .content {
-  width: 92%;
-  height: 92vh;
-  padding: 4%;
+    height:100%;
   .banner {
     height: 25%;
+	margin-bottom:30rpx;
     image {
       width: 100%;
       height: 100%;
@@ -149,6 +148,7 @@ export default {
       image {
         width: 100%;
         height: 100%;
+		border-radius: 20rpx;
       }
     }
   }

+ 9 - 9
pages/supply/index.vue

@@ -26,7 +26,7 @@
         @tap="toDetail(supply.id)"
       >
         <view class="image_content">
-          <image :src="supply.image" />
+          <image :src="supply.image" mode="aspectFill"/>
         </view>
         <view class="info">
           <view class="title">
@@ -135,10 +135,10 @@ export default {
               );
               ob.time = time + " " + timeSecond;
               ob.state = item.type;
-               ob.image = ''
+               ob.image = "/static/nodata.svg"
               // ob.image = item.attach_list[0]
               //   ? getApp().globalData.shareUrl + item.attach_list[0].url
-              //   : "";
+              //   : "/static/nodata.svg";
               return ob;
             });
             // console.log(res.data.data.list);
@@ -160,22 +160,22 @@ export default {
   .picker {
     position: fixed;
     top: 3%;
-    left: 10%;
+    left: 16%;
     color: #007aff;
     .picker_title {
       width: 120rpx;
       display: flex;
       align-items: center;
-      justify-content: space-between;
+      justify-content: space-around;
       .triangle-down {
         width: 0;
         height: 0;
-        border-top: 20rpx solid rgb(173, 173, 173);
-        border-left: 20rpx solid transparent;
-        border-right: 20rpx solid transparent;
+        border-top: 15rpx solid rgb(173, 173, 173);
+        border-left: 15rpx solid transparent;
+        border-right: 15rpx solid transparent;
       }
       .pickername {
-        font-size: 35rpx;
+        font-size: 32rpx;
         font-weight: 100;
       }
     }

BIN
static/logo.jpg