From 352adae52d70d033623a9004f51b9ecc0066aa40 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 23 Feb 2022 12:04:14 +0800
Subject: [PATCH 1/2] BUG 27628

---
 src/mods/AppSupermarket/AppSupermarket.vue |  3 +-
 src/mods/AppSupermarket/balance.vue        |  6 +-
 src/mods/AppSupermarket/resultPage.vue     | 69 ++++++++++++++++++++++
 3 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 src/mods/AppSupermarket/resultPage.vue

diff --git a/src/mods/AppSupermarket/AppSupermarket.vue b/src/mods/AppSupermarket/AppSupermarket.vue
index 1c6410b..14d7b9e 100644
--- a/src/mods/AppSupermarket/AppSupermarket.vue
+++ b/src/mods/AppSupermarket/AppSupermarket.vue
@@ -112,7 +112,7 @@ export default {
         })
       })
       uni.navigateTo({
-        url: "/pages/supermarket/balance?category=" + JSON.stringify(filter)
+        url: "./balance?category=" + JSON.stringify(filter)
       })
     },
     active(key) {
@@ -255,7 +255,6 @@ uni-page-body {
             .less {
               width: 40px;
               height: 40px;
-              font-size: 20px;
               display: flex;
               align-items: center;
               justify-content: center;
diff --git a/src/mods/AppSupermarket/balance.vue b/src/mods/AppSupermarket/balance.vue
index 482d72e..9be4a84 100644
--- a/src/mods/AppSupermarket/balance.vue
+++ b/src/mods/AppSupermarket/balance.vue
@@ -109,12 +109,12 @@ export default {
       .then(res => {
         if (res.code == 0) {
           uni.navigateTo({
-            url: '/pages/supermarket/components/resultPage/resultPage'
+            url: './resultPage'
           })
         } else {
           uni.navigateTo({
             url:
-                '/pages/supermarket/components/resultPage/resultPage?flag=' +
+                './resultPage?flag=' +
                 false
           })
         }
@@ -128,7 +128,7 @@ export default {
     },
     handleSelect() {
       uni.navigateTo({
-        url: '/pages/supermarket/search'
+        url: './search'
       })
     }
   }
diff --git a/src/mods/AppSupermarket/resultPage.vue b/src/mods/AppSupermarket/resultPage.vue
new file mode 100644
index 0000000..ebaccf0
--- /dev/null
+++ b/src/mods/AppSupermarket/resultPage.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="result-page">
+    <img :src="imgSrc" alt="">
+    <text>{{ text }}</text>
+    <u-button type="primary" :custom-style="{width:'100%',borderRadius:'4px',marginTop:'48px'}" @click="goBack">
+      {{ btnText }}
+    </u-button>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "result-page",
+  data() {
+    return {
+      flag: true
+    }
+  },
+  onLoad(val) {
+    if (val.flag) {
+      this.flag = val.flag
+    }
+  },
+  methods: {
+    goBack() {
+      uni.navigateBack({
+        delta: 3
+      })
+    }
+  },
+  computed: {
+    text() {
+      return this.flag ? '领取成功！' : '领取失败！请联系管理员处理'
+    },
+    btnText() {
+      return this.flag ? '确定' : '我知道了'
+    },
+    imgSrc() {
+      return this.flag ? (this.$cdn + 'other/' + 'kztcg.png') : (this.$cdn + 'other/' + 'kztsb.png')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.result-page {
+  min-height: 100%;
+  background-color: #ffffff;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 96px;
+
+  img {
+    width: 192px;
+    height: 192px;
+  }
+
+  text {
+    font-size: 36px;
+    font-weight: 800;
+    color: #333333;
+    line-height: 50px;
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>

From 71a711dae7e335dbb1a6c152cbbbad874d7daa40 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 23 Feb 2022 12:10:55 +0800
Subject: [PATCH 2/2] BUG 27606

---
 src/mods/service/AppPhotoReport/PhotoForm.vue | 93 +++++++++----------
 .../service/AppReturnHomeRegister/Add.vue     |  4 +-
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/mods/service/AppPhotoReport/PhotoForm.vue b/src/mods/service/AppPhotoReport/PhotoForm.vue
index 8b9911c..5867f00 100644
--- a/src/mods/service/AppPhotoReport/PhotoForm.vue
+++ b/src/mods/service/AppPhotoReport/PhotoForm.vue
@@ -8,10 +8,7 @@
             <h2>事件类型</h2>
           </div>
           <div class="form-item__right">
-            <!-- <ai-select :list="dictList" v-model="form.groupId"></ai-select>
-             -->
-
-            <u-select v-model="showSel" value-name="value" label-name="label" :list="dictList"></u-select>
+            <AiSelect :list="dictList" v-model="form.groupId" placeholder="请选择"/>
           </div>
         </div>
       </div>
@@ -38,7 +35,7 @@
           <div class="form-item__right" @click="chooseAddress">
             <span v-if="form.address">{{ form.address }}</span>
             <i v-else>请选择</i>
-            <u-icon name="arrow-right" color="#ddd" />
+            <u-icon name="arrow-right" color="#ddd"/>
           </div>
         </div>
       </div>
@@ -48,11 +45,12 @@
             <i>*</i>
             <h2>所属网格</h2>
           </div>
-          <picker :range="gridList" mode="multiSelector" range-key="girdName" @columnchange="onColumnChange" @change="onChange">
+          <picker :range="gridList" mode="multiSelector" range-key="girdName" @columnchange="onColumnChange"
+                  @change="onChange">
             <div class="form-item__right">
               <span v-if="form.girdName">{{ form.girdName }}</span>
               <i v-else>请选择</i>
-              <u-icon name="arrow-right" color="#ddd" />
+              <u-icon name="arrow-right" color="#ddd"/>
             </div>
           </picker>
         </div>
@@ -80,7 +78,7 @@
             <h2>姓名</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.name" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -91,7 +89,7 @@
             <h2>联系方式</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.phone" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.phone" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -103,7 +101,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
 export default {
   data() {
@@ -156,24 +154,25 @@ export default {
         },
         fail: () => {
           this.$dialog
-            .confirm({
-              content: '您未授权定位权限，无法选择位置',
-            })
-            .then(() => {
-              wx.openSetting({
-                success: (res) => {
-                  if (!res.authSetting['scope.userLocation']) {
-                    this.$dialog
-                      .alert({
-                        content: '您未授权定位权限，无法选择位置',
-                      })
-                      .then(() => {})
-                  } else {
-                    console.log('设置定位权限')
-                  }
-                },
-              })
+          .confirm({
+            content: '您未授权定位权限，无法选择位置',
+          })
+          .then(() => {
+            wx.openSetting({
+              success: (res) => {
+                if (!res.authSetting['scope.userLocation']) {
+                  this.$dialog
+                  .alert({
+                    content: '您未授权定位权限，无法选择位置',
+                  })
+                  .then(() => {
+                  })
+                } else {
+                  console.log('设置定位权限')
+                }
+              },
             })
+          })
         },
       })
     },
@@ -257,26 +256,26 @@ export default {
 
       this.$loading()
       this.$instance
-        .post(`/app/appclapeventinfo/addOrUpdate`, {
-          ...this.form,
-          openid: this.user.openid,
-          portrait: this.user.avatarUrl,
-          files: this.form.files,
-          groupName: this.dictList.filter((v) => v.value === this.form.groupId)[0].label,
-        })
-        .then((res) => {
-          this.$hideLoading()
-          this.flag = false
-          if (res.code == 0) {
-            uni.$emit('update')
-            setTimeout(() => {
-              uni.redirectTo({
-                url: './PhotoResult?id=' + res.data.id,
-              })
-            }, 400)
-          }
-          this.$hideLoading()
-        })
+      .post(`/app/appclapeventinfo/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid,
+        portrait: this.user.avatarUrl,
+        files: this.form.files,
+        groupName: this.dictList.filter((v) => v.value === this.form.groupId)[0].label,
+      })
+      .then((res) => {
+        this.$hideLoading()
+        this.flag = false
+        if (res.code == 0) {
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.redirectTo({
+              url: './PhotoResult?id=' + res.data.id,
+            })
+          }, 400)
+        }
+        this.$hideLoading()
+      })
     },
   },
 }
diff --git a/src/mods/service/AppReturnHomeRegister/Add.vue b/src/mods/service/AppReturnHomeRegister/Add.vue
index d119374..025328e 100644
--- a/src/mods/service/AppReturnHomeRegister/Add.vue
+++ b/src/mods/service/AppReturnHomeRegister/Add.vue
@@ -42,7 +42,7 @@
             <h2>人员类别</h2>
           </div>
           <div class="form-item__right">
-            <ai-select v-model="form.type" dict="epidemicRecentPersonType" class="select"></ai-select>
+            <AiSelect v-model="form.type" dict="epidemicRecentPersonType" class="select"></AiSelect>
           </div>
         </div>
       </div>
@@ -55,7 +55,7 @@
             <h2>出行方式</h2>
           </div>
           <div class="form-item__right">
-            <ai-select dict="epidemicRecentTravel" v-model="form.travelType" class="select"></ai-select>
+            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
           </div>
         </div>
       </div>