Merge branch 'xiaowang' into feature

# Conflicts:
#	src/views/Enjoyableservices/index.vue
#	src/views/activity/detail.vue

src/components/Android/index.vue

@@ -0,0 +1,81 @@
+<template>
+       <div class="footer" v-if="mobileModel!=='Phone'">
+            <div class="flex flex-x flex-end " style="width: 150px;"> 
+            <van-icon name="arrow-left"   @click="goToPreviousPage()"/>
+            <!-- <div class="" @click="goToPreviousPage()"><</div> -->
+            <!-- <div class="AAA" @click="goToNextPage()">></div>           -->
+            <van-icon name="arrow" @click="goToNextPage()" />
+        </div>
+          
+    </div>
+      
+  </template>
+  
+  <script>
+
+  export default {
+    name: 'Android',
+
+    data() {
+      return {
+        mobileModel:null
+      }
+    },
+    props: {
+      
+    },
+    watch: {
+      
+    },
+    mounted() {
+        this.getMobileModel()
+    },
+    methods: {
+        goToPreviousPage() {
+            history.back();  
+        },
+        goToNextPage() {
+            history.forward();
+        },
+        getMobileModel() {
+            var userAgent = navigator.userAgent || navigator.vendor || window.opera;
+            // 使用正则表达式匹配常见的移动设备型号
+            var androidMatch = userAgent.match(/Android\s([0-9\.]+)[\s\/;]*[^\s]+/i);
+            var iosMatch = userAgent.match(/\((iPhone|iPad|iPod)[^;]+;[\s\S]+?OS\s([0-9_]+)/i);
+            this.mobileModel = "未知设备";
+            if (androidMatch) {
+                this.mobileModel = "Android " + androidMatch[1];
+            } else if (iosMatch) {
+                mobileModel = iosMatch[1] + " iOS " + iosMatch[2].replace(/_/g, '.');
+            } else {
+                // 可以根据需要添加更多的匹配规则来识别更多设备
+                var otherMatch = userAgent.match(/(Mobile|Tablet|Phone)/i);
+                if (otherMatch) {
+                    this.mobileModel = otherMatch[0];
+                }
+            }
+            console.log("用户的手机型号是：" + this.mobileModel);
+            this.$emit('send-number', this.mobileModel)
+            return this.mobileModel;
+            
+        },
+    }
+  }
+  </script>
+  
+  <style scoped lang="less">
+  .footer{
+    background-color: white;
+    width: 375px;
+    height: 8vh;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    font-size: 25px;
+    
+}
+  </style>
+  

src/views/Enjoyableservices/detail.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="container">
+        <div class="container" :style="this.phone=='Phone'?'':'height: 80vh; overflow: auto;'">
             <div class="card">
                 <div class="font-size21 font-bold">{{ info.title }}</div>
                 <div class="flex flex-x  flex-center2 m-top10 m-bottom10">
@@ -19,10 +19,13 @@
                 <div  v-html="info.content"></div>
             </div>
         </div>
+        <Android @send-number="handleNumber"/>
     </div>
 </template>
+
 <script>
 import { icServiceWarmRecord } from '@/api/user'
+import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -30,9 +33,11 @@ export default {
                 title: '鞠源社区为退役待就业的军人提供 就业岗位',
                 content: '<p>县级以上地方人民政府退役士兵安置工作主管部门组织自主就业的退役士兵参加职业教育</p><p>县级以上地方人民政府退役士兵安置工作主管部门组织自主就业的退役士兵参加职业教育</p>', data: '2024-05-08 09:30'
                 , status: 1, condition: '退役军人 40-60岁', provider: 'XXX就业指导中心', serviceData: "2024-05-08 13:00至2024-6-22 13:00"
-            }
+            },
+            phone:""
         }
     },
+    components:{Android},
     created() {
     },
     mounted(){
@@ -41,6 +46,10 @@ export default {
         }
     },
     methods: {
+        handleNumber(value){
+            console.log(value,"wl kgnsl, ");
+            this.phone=value
+        },
         async icServiceWarmRecord(id){
             let res = await icServiceWarmRecord(id)
             if(res.code === 0){

src/views/Enjoyableservices/index.vue

@@ -1,45 +1,45 @@
 <template>
     <div>
-        <div class="container">
+    <div class="container">
-            <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="myCommonsService" class="card"
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="myCommonsService" class="card"
-                :offset="50">
+            :offset="50">
-                <div class="card  m-bottom10" v-for="(item, index) in EnjoyableList" :key="index"
+            <div class="card  m-bottom10" v-for="(item,index) in EnjoyableList" :key="index"  @click="$router.push({ path: `/detailServices`,query:{id:item.id} })"> 
-                    @click="$router.push({ path: `/detailServices`, query: { id: item.id } })">
+            <div class="flex flex-x  flex-center2">
-                    <div class="flex flex-x  flex-center2">
+                <van-tag v-if="item.status" color="#EBF1FE" text-color="#3974F6" size="large">{{ item.status? "进行中":"已结束" }}</van-tag> 
-                        <van-tag v-if="item.status" color="#EBF1FE" text-color="#3974F6" size="large">{{ item.status ?
+                <van-tag v-if="!item.status" color="#F5F5F5" text-color="#AAAAAA" size="large">{{ item.status? "进行中":"已结束" }}</van-tag>
-                            "进行中":"已结束" }}</van-tag>
+                <div class="font-size13 C1 m-left12">{{ item.startDate }}</div>
-                        <van-tag v-if="!item.status" color="#F5F5F5" text-color="#AAAAAA" size="large">{{ item.status ?
+            </div>
-                            "进行中":"已结束" }}</van-tag>
+            <div class="m-top10">{{ item.title }}</div>
-                        <div class="font-size13 C1 m-left12">{{ item.startDate }}</div>
+            <div class="flex flex-x m-top10 ">
-                    </div>
+                <div class="font-size15 AAA">享受服务条件：</div>
-                    <div class="m-top10">{{ item.title }}</div>
+                <div class="font-size15 AAA">{{ item.resiSearchTagName }}</div>
-                    <div class="flex flex-x m-top10 ">
+            </div>
-                        <div class="font-size15 AAA">享受服务条件：</div>
-                        <div class="font-size15 AAA">{{ item.resiSearchTagName }}</div>
-                    </div>
-                </div>
-            </van-list>
         </div>
+        </van-list>
+       </div>
+       <Android></Android>
     </div>
 </template>
 <script>
 import { myCommonsService } from '@/api/user'
-export default {
+import Android from '@/components/Android'
-    data() {
+    export default{
-        return {
+        data(){
-            EnjoyableList: [],
+            return{
-            finished: false,
+                EnjoyableList:[],
+                finished: false,
             loading: true,
             showRegister: false,
-            pageSize: 10,
+            pageSize:10,
-            pageNo: 1
+            pageNo:1
-        }
+            }
-    },
+        },
-    created() {
+        components:{Android},
-        this.myCommonsService()
+        created(){
-    },
+            this.myCommonsService()
-    methods: {
+        },
-        async myCommonsService() {
+        methods:{
+            async myCommonsService() {
             let res = await myCommonsService()
             if (res.code === 0) {
                 debugger

src/views/activity/detail.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class='container m-bot50'>
+    <div> 
+        <div class='container m-bot50'   :style="this.phone=='Phone'?'':'height: 80vh; overflow: auto;'">
         <div class="card">
             <img :src="info.coverPic" alt="" style="width: 100%;">
             <div class="m-top15 p0">
@@ -38,7 +39,7 @@
             </van-cell-group>
 
         </div>
-        <div class="bot_btn flex flex-center2" style="height: 50px;">
+        <div class="bot_btn flex flex-center2  " :style="this.phone=='Phone'?'height:50px;bottom:0':'height: 50px;bottom:8vh;'">
             <div class="flex1 flex flex-center1 flex-center2">报名人数：<span class="orange font-size18">{{
                 info.currentParticipants || 0 }}</span> / {{ info.participants }}人</div>
             <div class="flex1 flex flex-center1 flex-center2">
@@ -52,7 +53,10 @@
         <Share :show="showShare" @closeShare="showShare = false" />
         <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
 
-    </div>
+        </div>
+    <Android @send-number="handleNumber"/>
+</div>
+   
 </template>
 
 <script>
@@ -60,6 +64,8 @@ import { addActivityRecord, detail, communityActivityApplicationRecordDelete } f
 import Share from "@/components/Share"
 import registerDialog from '@/components/registerDialog';
 import { setConfig } from '@/utils/jweixin'
+import Android from '@/components/Android'
+
 export default {
     data() {
         return {
@@ -70,7 +76,8 @@ export default {
             info: {},
             isPast: false,
             showShare: false,
-            showRegister: false
+            showRegister: false,
+            phone:""
         };
     },
     created() {
@@ -106,6 +113,10 @@ export default {
                     success: function () {}
                 })
             }
+        },        
+        handleNumber(value){
+            console.log(value,"wl kgnsl, ");
+            this.phone=value
         },
         checkIfPast() {
             const currentTimestamp = Date.now();
@@ -180,7 +191,7 @@ export default {
 
         },
     },
-    components: { Share, registerDialog },
+    components: { Share,Android, registerDialog },
     computed: {
         disabledRecord() {
             return (item) => {
@@ -195,6 +206,10 @@ export default {
 </script>
 
 <style lang='less' scoped>
+.phone{
+    height: 50px;
+    bottom:8vh;
+}
 :deep(.p0>.van-cell) {
     padding: 0;
 }

src/views/activity/index.vue

@@ -21,13 +21,14 @@
             </div>
         </van-list>
         <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
+        <Android></Android>
     </div>
 </template>
 
 <script>
 import { communityActivity } from '@/api/home';
 import registerDialog from '@/components/registerDialog';
-
+import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -76,7 +77,7 @@ export default {
 
         }
     },
-    components: { registerDialog },
+    components: { registerDialog,Android },
     computed: {
         recordFlag() {
             return (item) => {

src/views/appeal/index.vue

@@ -20,12 +20,15 @@
                 @click.prevent.stop="previewImage(index2, item.imageList)" :src="item2" :key="index2" />
             </div>
           </div>
+          <Android/>
       </van-list>
+
   </div>
 </template>
 
 <script>
   import { collects } from '@/api/event'
+  import Android from '@/components/Android'
 export default {
   data() {
       return {
@@ -70,7 +73,7 @@ export default {
           }
       },
   },
-  components: {},
+  components: {Android},
   computed: {},
   watch: {},
 }

src/views/appealDetail/index.vue

@@ -193,6 +193,7 @@
         </van-step>
       </van-steps>
     </div>
+        <Android/>
   </div>
 </template>
 
@@ -200,11 +201,14 @@
 import { ImagePreview } from 'vant'
 import { process, updateEvent } from '@/api/event'
 import { getUserDemandUnSolvedDetail } from '@/api/demand'
+import Android from '@/components/Android'
 
 export default {
   name: 'appealDetail',
+  
   components: {
-    [ImagePreview.Component.name]: ImagePreview.Component
+    [ImagePreview.Component.name]: ImagePreview.Component,
+    Android
   },
   data() {
     return {

src/views/communityPublicity/detail.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class='container m-bot50'>
+    <div>
+     <div class='container m-bot50' :style="this.phone=='Phone'?'':'height: 80vh; overflow: auto;'">
         <div class="card">
             <div class="m-top15 p0">
                 <h2 style="margin: 0; font-size: 21px;">{{ info.title }}</h2>
@@ -12,7 +13,7 @@
                 </div>
             </div>
         </div>
-        <div class="bot_btn flex flex-center2" style="height: 50px;">
+        <div class="bot_btn flex flex-center2" :style="this.phone=='Phone'?'height:50px;bottom:0':'height: 50px;bottom:8vh;'">
             <div class="flex1 flex flex-center1 flex-center2">
                 <van-button size="small" class="m-right7" round @click="communityPublicityGiveLike(info.id,'likes')">
                     <template #icon>
@@ -28,9 +29,14 @@
         </div>
         <Share :show="showShare" @closeShare="showShare = false" />
     </div>
+    <Android @send-number="handleNumber"></Android>
+</div>
+   
 </template>
 
 <script>
+import Android from '@/components/Android'
+
 import { setConfig } from '@/utils/jweixin'
 import {communityPublicityGiveLike } from '@/api/home';
 import Share from "@/components/Share"
@@ -39,6 +45,7 @@ export default {
         return {
             info: {},
             showShare:false,
+            phone:""
         };
     },
     created() {
@@ -51,6 +58,10 @@ export default {
         this.share()
     },
     methods: {
+        handleNumber(value){
+            console.log(value,"wl kgnsl, ");
+            this.phone=value
+        },
         async communityPublicityGiveLike(id,type){
             let parm = {
                 id,
@@ -87,7 +98,7 @@ export default {
             }
         }
     },
-    components: {Share},
+    components: {Share,Android},
     computed: {},
     watch: {},
 }

src/views/communityPublicity/index.vue

@@ -39,6 +39,7 @@
                 </van-tab>
             </van-tabs>
         </div>
+        <Android></Android>
     </div>
 
 
@@ -46,7 +47,7 @@
 
 <script>
 import { advertisingTag, communityPublicity } from '@/api/home';
-
+import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -131,7 +132,7 @@ export default {
             this.communityPublicity()
         },
     },
-    components: {},
+    components: {Android},
     computed: {},
     watch: {},
 }

src/views/discussion/discusionDetail.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class='container'>
+    <div>
+           <div class='container' style="height: 80vh; overflow: auto;">
         <div class="card flex flex-y ">
             <div class="m-bottom5">{{ ProblemDescription.eventContent }}</div>
             <div class="font-size13 gray">{{ ProblemDescription.happenTime }}</div>
@@ -34,10 +35,14 @@
             </van-button>
         </div>
     </div>
+    <Android/>
+    </div>
+ 
 </template>
 
 <script>
 import { andelClicDetail, handelClicsupport } from '@/api/home';
+import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -56,6 +61,7 @@ export default {
         };
 
     },
+    components:{Android},
     created() {
         this.eventId = this.$route.query.eventId
         this.id = this.$route.query.eventId

src/views/discussion/index.vue

@@ -25,6 +25,7 @@
             <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
 
         </div>
+        <Android></Android>
     </div>
 
 
@@ -33,7 +34,7 @@
 <script>
 import { communityActivity,icEventOldDiscuss,handelClicsupport } from '@/api/home';
 import registerDialog from '@/components/registerDialog';
-
+import Android from '@/components/Android'
 export default {
     data() {
         return {
@@ -125,7 +126,7 @@ export default {
 
         }
     },
-    components: { registerDialog },
+    components: { registerDialog,Android },
     computed: {},
     watch: {},
 }

src/views/event/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
+  <div>  
-    <van-tabs v-model="type" animated lazy-render sticky swipeable>
+    <van-tabs  v-model="type" animated lazy-render sticky swipeable :style="this.phone=='Phone'?'':'height: 90vh; overflow: auto;'">
       <van-tab title="上报诉求">
         <div class="container">
           <div class="block">
@@ -59,7 +59,11 @@
         <appeal v-if="type == 1"/>
       </van-tab>
     </van-tabs>
-  </div>
+  
+
+  <Android @send-number="handleNumber"/>
+</div>
+
 </template>
 
 <script>
@@ -67,6 +71,7 @@ import {setConfig} from '@/utils/jweixin'
 import Recording from '@/components/Recording'
 import Perfect from '@/components/Perfect'
 import Audio from '@/components/Audio'
+import Android from '@/components/Android'
 import Map from '@/components/Map'
 import appeal from '@/views/appeal'
 import {uploadvariedfile} from '@/api/basic'
@@ -75,7 +80,7 @@ import {mapKey} from '@/config'
 
 export default {
   name: 'event',
-  components: {Recording, Audio, Perfect, Map, appeal},
+  components: {Recording, Android,Audio, Perfect, Map, appeal},
   data() {
     return {
       type: 0,
@@ -115,6 +120,10 @@ export default {
 
   },
   methods: {
+    handleNumber(value){
+            console.log(value,"wl kgnsl, ");
+            this.phone=value
+        },
     // 获取当前位置
     getMyLocation() {
       this.geolocation.getLocation(this.showPosition, this.errorPosition) //开启定位

src/views/mine/index.vue

@@ -54,10 +54,12 @@
         </van-cell>
       </div>
     </div>
+    <Android @send-number="handleNumber"></Android>
   </div>
 </template>
 
 <script>
+import Android from '@/components/Android'
 export default {
   name: 'mine',
   data() {
@@ -65,10 +67,18 @@ export default {
       userInfo: {}
     }
   },
+  components:{
+    Android
+  },
   mounted() {
     this.userInfo = this.$store.state.app.userInfo
   },
-  methods: {}
+  methods: {
+    handleNumber(value){
+            console.log(value,"wl kgnsl, ");
+            this.phone=value
+        },
+  }
 }
 </script>
 

src/views/mine/myActivity/index.vue

@@ -19,11 +19,13 @@
                 </div>
             </div>
         </van-list>
+        <Android/>
     </div>
 </template>
 
 <script>
 import { communityActivity } from '@/api/home';
+import Android from '@/components/Android'
 
 export default {
     data() {
@@ -62,7 +64,7 @@ export default {
         },
      
     },
-    components: {},
+    components:{Android},
     computed: {},
     watch: {},
 }

src/views/mine/mySatisfaction/index.vue

@@ -16,11 +16,13 @@
                     </div>
             </div>
         </van-list>
+        <Android/>
     </div>
 </template>
 
 <script>
 import { inspRecord } from '@/api/satisfaction';
+import Android from '@/components/Android'
 
 export default {
     data() {
@@ -57,7 +59,7 @@ export default {
             
         }
     },
-    components: {},
+    components: {Android},
     computed: {},
     watch: {},
 }