feat: 添加输入工具码界面

CHANGELOG.md

@@ -54,6 +54,7 @@
  - | 模拟接口测试 | [69e7931](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/69e7931)
  - | 添加 环境变量，动态控制webview project的path | [8a40481](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/8a40481)
  - | 添加子任务插件 子项目插件 | [7bda7e2](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/7bda7e2)
+ - | 添加已测评页面,压缩代码 | [551e5ea](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/551e5ea)
  - | 添加引导页 | [4293f5a](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/4293f5a)
  - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/2b81bbc)
  - | 添加药物使用记录界面 | [425cb63](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/425cb63)

src/components/ConfigInfo/ConfigInfo.vue

@@ -27,7 +27,7 @@
         </view>
       </view>
       <view class="py-6 flex flex-col text-center">
-        <img class="mx-auto weixin-png" src="https://www.tall.wiki/staticrec/guide/weixin.png" />
+        <img class="mx-auto weixin-png" src="https://www.tall.wiki/staticrec/yanyuan/weixin.png" />
         <view class="mt-2" style="color: #999">扫码添加客服微信</view>
       </view>
     </view>
@@ -46,10 +46,10 @@ export default {
   data() {
     return {
       itemList: [
-        { head: '基本信息', open: true, body: '123', img: 'https://www.tall.wiki/staticrec/guide/menu1.png' },
+        { head: '基本信息', open: true, body: '123', img: 'https://www.tall.wiki/staticrec/yanyuan/menu1.png' },
-        { head: '药物使用记录', open: false, body: '123', img: 'https://www.tall.wiki/staticrec/guide/menu2.png' },
+        { head: '药物使用记录', open: false, body: '123', img: 'https://www.tall.wiki/staticrec/yanyuan/menu2.png' },
-        { head: 'Zarit照顾者分担量表', open: false, body: '123', img: 'https://www.tall.wiki/staticrec/guide/menu3.png' },
+        { head: 'Zarit照顾者分担量表', open: false, body: '123', img: 'https://www.tall.wiki/staticrec/yanyuan/menu3.png' },
-        { head: '家属成员', open: false, body: '123', img: 'https://www.tall.wiki/staticrec/guide/menu4.png' },
+        { head: '家属成员', open: false, body: '123', img: 'https://www.tall.wiki/staticrec/yanyuan/menu4.png' },
       ],
       headStyle: {
         borderBottom: '1px solid #f8f8f8',

src/components/GuidePage/GuidePage.vue

@@ -18,23 +18,23 @@ export default {
       current: 0,
       list: [
         {
-          image: 'https://www.tall.wiki/staticrec/guide/1.png',
+          image: 'https://www.tall.wiki/staticrec/yanyuan/1.png',
           title: '1',
         },
         {
-          image: 'https://www.tall.wiki/staticrec/guide/2.png',
+          image: 'https://www.tall.wiki/staticrec/yanyuan/2.png',
           title: '2',
         },
         {
-          image: 'https://www.tall.wiki/staticrec/guide/3.png',
+          image: 'https://www.tall.wiki/staticrec/yanyuan/3.png',
           title: '3',
         },
         {
-          image: 'https://www.tall.wiki/staticrec/guide/4.png',
+          image: 'https://www.tall.wiki/staticrec/yanyuan/4.png',
           title: '4',
         },
         {
-          image: 'https://www.tall.wiki/staticrec/guide/5.png',
+          image: 'https://www.tall.wiki/staticrec/yanyuan/5.png',
           title: '5',
         },
       ],

src/components/Upload/Upload.vue

@@ -8,15 +8,13 @@
       <u-icon
         class="icons icon1"
         size="76"
-        name="https://www.tall.wiki/staticrec/guide/icon1.png"
+        name="https://www.tall.wiki/staticrec/yanyuan/icon1.png"
         @click="openPage('/pagesYanyuan/scan-code/scan-code')"
       ></u-icon>
-      <!-- @click="openPage('/pagesYanyuan/scan-code/scan-code')" -->
-      <!-- @click="scanCode" -->
       <u-icon
         class="icons icon2"
         size="76"
-        name="https://www.tall.wiki/staticrec/guide/icon2.png"
+        name="https://www.tall.wiki/staticrec/yanyuan/icon2.png"
         v-if="showAddInfo"
         @click="openPage('/pagesYanyuan/add-info/add-info')"
       ></u-icon>
@@ -24,13 +22,13 @@
         class="icons icon3"
         size="76"
         :class="showAddInfo ? '' : 'icon3-top'"
-        name="https://www.tall.wiki/staticrec/guide/icon3.png"
+        name="https://www.tall.wiki/staticrec/yanyuan/icon3.png"
         @click="openPage('/pagesYanyuan/ascription/ascription')"
       ></u-icon>
       <u-icon
         class="icons icon4"
         size="76"
-        name="https://www.tall.wiki/staticrec/guide/icon4.png"
+        name="https://www.tall.wiki/staticrec/yanyuan/icon4.png"
         @click="openPage('/pagesYanyuan/hold-all/hold-all')"
       ></u-icon>
     </view>
@@ -74,7 +72,7 @@ export default {
     },
 
     openPage(url) {
-      uni.navigateTo({ url: `${url}` });
+      this.$t.page.openPage(url);
       this.showMenu = false;
     },
 

src/pages.json

@@ -31,6 +31,13 @@
 							"navigationStyle": "default"
 						}
 					},
+					{
+						"path": "input-code/input-code",
+						"style": {
+							"navigationBarTitleText": "输入工具码",
+							"navigationStyle": "default"
+						}
+					},
 					{
 						"path": "add-info/add-info",
 						"style": {

src/pagesYanyuan/ascription/ascription.vue

@@ -53,7 +53,7 @@ export default {
       lists: [
         {
           title: '迷宫',
-          img: 'https://www.tall.wiki/staticrec/guide/1.png',
+          img: 'https://www.tall.wiki/staticrec/yanyuan/1.png',
           train: '',
           showTrain: false,
           trainer: ['张斌', '思南', '雪梅', '方圆', '张野', '马壮', '慧娟'],
@@ -87,13 +87,13 @@ export default {
             left: 0,
             color: '#EDEDED',
             value: '非常困难',
-            bgPic: 'https://www.tall.wiki/staticrec/guide/bubble-gray.png',
+            bgPic: 'https://www.tall.wiki/staticrec/yanyuan/bubble-gray.png',
             boxBg: '',
           },
         },
         {
           title: '迷宫',
-          img: 'https://www.tall.wiki/staticrec/guide/1.png',
+          img: 'https://www.tall.wiki/staticrec/yanyuan/1.png',
           train: '',
           showTrain: false,
           trainer: ['张斌', '思南', '雪梅', '方圆', '张野', '马壮', '慧娟'],
@@ -127,7 +127,7 @@ export default {
             left: 0,
             color: '#EDEDED',
             value: '非常困难',
-            bgPic: 'https://www.tall.wiki/staticrec/guide/bubble-gray.png',
+            bgPic: 'https://www.tall.wiki/staticrec/yanyuan/bubble-gray.png',
             boxBg: '',
           },
         },
@@ -143,17 +143,17 @@ export default {
       if (value < 3) {
         position.color = '#EB5A0D';
         position.value = '非常困难';
-        position.bgPic = 'https://www.tall.wiki/staticrec/guide/bubble-red.png';
+        position.bgPic = 'https://www.tall.wiki/staticrec/yanyuan/bubble-red.png';
         position.boxBg = 'bg-red-500';
       } else if (value < 5) {
         position.color = '#1890FF';
         position.value = '略有困难';
-        position.bgPic = 'https://www.tall.wiki/staticrec/guide/bubble-blue.png';
+        position.bgPic = 'https://www.tall.wiki/staticrec/yanyuan/bubble-blue.png';
         position.boxBg = 'bg-blue-500';
       } else {
         position.color = '#F4C130';
         position.value = '轻松完成';
-        position.bgPic = 'https://www.tall.wiki/staticrec/guide/bubble-yellow.png';
+        position.bgPic = 'https://www.tall.wiki/staticrec/yanyuan/bubble-yellow.png';
         position.boxBg = 'bg-yellow-500';
       }
 

src/pagesYanyuan/hold-all/hold-all.vue

@@ -5,7 +5,7 @@
         <view>{{ item.title }}</view>
         <view class="flex items-center text-gray-400">
           <text class="mr-2" v-if="item.name">{{ item.name }}</text>
-          <text class="mr-2" v-else @click="openPage('/pages/wifi-binding/wifi-binding')">绑定</text>
+          <text class="mr-2" v-else @click="$t.page.openPage('/pages/wifi-binding/wifi-binding')">绑定</text>
           <u-icon name="wifi" :color="item.bound ? '#1890FF' : '#999999'" size="36"></u-icon>
         </view>
       </view>
@@ -47,11 +47,7 @@ export default {
     };
   },
 
-  methods: {
+  methods: {},
-    openPage(url) {
-      uni.navigateTo({ url: `${url}` });
-    },
-  },
 };
 </script>
 

src/pagesYanyuan/input-code/input-code.vue

@@ -0,0 +1,46 @@
+<template>
+  <view class="flex flex-col items-center mx-3">
+    <view class="px-6 w-full">
+      <img class="w-full mt-16" style="height: 6rem" src="https://www.tall.wiki/staticrec/yanyuan/input-code.png" />
+    </view>
+
+    <view class="flex flex-nowrap my-5">
+      <u-input
+        input-align="center"
+        type="number"
+        :value="num.value"
+        :placeholder="placeholder"
+        class="flex-1 mx-1 bg-gray-100"
+        v-for="num in nums"
+        :key="num.id"
+      />
+    </view>
+    <view class="px-2 mt-2 w-full">
+      <u-button type="primary" class="w-full">确认</u-button>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      placeholder: ' ',
+      nums: [
+        { value: '', id: 1 },
+        { value: '', id: 2 },
+        { value: '', id: 3 },
+        { value: '', id: 4 },
+        { value: '', id: 5 },
+        { value: '', id: 6 },
+        { value: '', id: 7 },
+        { value: '', id: 8 },
+        { value: '', id: 9 },
+        { value: '', id: 10 },
+      ],
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/pagesYanyuan/scan-code/scan-code.vue

@@ -1,21 +1,37 @@
 <template>
+  <view>
     <!-- <view>
     <Info class="bg-white" />
     <EndLine />
   </view> -->
     <!--scan.wxml-->
     <view class="scan-view">
-    <camera class="scan-camera" mode="scanCode" binderror="cameraError" bindscancode="scancode" frame-size="large">
+      <camera class="scan-camera" mode="scanCode" binderror="cameraError" bindscancode="scancode" frame-size="large" :flash="flash">
-      <!-- <cover-image class="cover-corner cover-left-top" src="/images/left-top.png"></cover-image>
-      <cover-image class="cover-corner cover-right-top" src="/images/right-top.png"></cover-image>
-      <cover-image class="cover-corner cover-left-bottom" src="/images/left-bottom.png"></cover-image>
-      <cover-image class="cover-corner cover-right-bottom" src="/images/right-bottom.png"></cover-image> -->
-
         <cover-view class="scan-animation" :animation="animation"></cover-view>
       </camera>
       <view class="text-white">扫二维码/条形码</view>
+    </view>
     <!-- 这里可以处理其他内容 -->
-    <u-button type="primary">主要按钮</u-button>
+    <view class="w-full flex justify-around btns">
+      <view class="flex flex-col text-center" @click="$t.page.openPage('/pagesYanyuan/input-code/input-code')">
+        <view class="rounded-full overflow-hidden">
+          <img class="pic" src="https://www.tall.wiki/staticrec/yanyuan/computer.png" />
+        </view>
+        <text class="mt-2 text-xs">输入工具码</text>
+      </view>
+      <view class="flex flex-col text-center" v-if="!open" @click="openElectric">
+        <view class="rounded-full overflow-hidden">
+          <img class="pic" src="https://www.tall.wiki/staticrec/yanyuan/open-electric.png" />
+        </view>
+        <text class="mt-2 text-xs">打开手电筒</text>
+      </view>
+      <view class="flex flex-col text-center" v-else @click="openElectric">
+        <view class="rounded-full overflow-hidden">
+          <img class="pic" src="https://www.tall.wiki/staticrec/yanyuan/close-electric.png" />
+        </view>
+        <text class="mt-2 text-xs">关闭手电筒</text>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -25,7 +41,7 @@ let animation = wx.createAnimation({});
 
 export default {
   data() {
-    return { animation };
+    return { animation, open: false, flash: 'auto' };
   },
   onLoad() {},
   onShow() {
@@ -57,6 +73,12 @@ export default {
       let res = e.detail.result;
       console.log('res: ', res);
     },
+
+    // 打开手电筒
+    openElectric() {
+      this.open = !this.open;
+      this.flash = !this.open ? 'on' : 'off';
+    },
   },
 };
 </script>
@@ -74,7 +96,7 @@ page {
   background-color: #010101;
   position: fixed;
   align-items: center;
-  justify-content: space-around;
+  padding-top: 150rpx;
 }
 
 .scan-camera {
@@ -91,26 +113,6 @@ page {
   position: absolute;
 }
 
-.cover-left-top {
-  left: 0;
-  top: 0;
-}
-
-.cover-right-top {
-  right: 0;
-  top: 0;
-}
-
-.cover-left-bottom {
-  left: 0;
-  bottom: 0;
-}
-
-.cover-right-bottom {
-  right: 0;
-  bottom: 0;
-}
-
 .scan-animation {
   position: absolute;
   top: -10rpx;
@@ -120,4 +122,17 @@ page {
   background-color: #08fdfe;
   border-radius: 50%;
 }
+
+.btns {
+  display: flex;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  padding: 64rpx;
+}
+
+.pic {
+  width: 100rpx;
+  height: 100rpx;
+}
 </style>

src/utils/page.js

@@ -0,0 +1,14 @@
+// 返回上一页
+const back = () => uni.navigateBack();
+
+/**
+ * 打开 某一页
+ * @param {string} pageName
+ * @param {String} param  "key=value"
+ */
+const openPage = (pageName, param) => {
+  const query = param || '';
+  uni.navigateTo({ url: `${pageName}?${query}` });
+};
+
+export default { back, openPage };

src/utils/tall.js

@@ -10,6 +10,7 @@ import upload from '@/utils/upload.js';
 import user from '@/config/user.js';
 import zIndex from '@/config/zIndex.js';
 import task from '@/config/task.js';
+import page from './page';
 
 const gateway = process.env.VUE_APP_API_URL;
 
@@ -27,6 +28,7 @@ const $t = {
   $q: cacheAndRequest,
   user, // 用户相关配置
   task, // 任务相关配置
+  page, // 页面跳转相关配置
 };
 
 uni.$t = $t;