From 62a3dea33680862d31cb286ab4f440aab603cf84 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Fri, 1 Apr 2022 18:00:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E9=AA=8C=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/device-info/index.vue          |  2 +-
 pages/device-operation/index.vue     |  4 ++--
 pages/digital-workshops/index.vue    |  3 +++
 pages/login/index.vue                |  4 ++--
 pages/production-operation/index.vue |  4 ++--
 pages/promotion/index.vue            | 13 +++++++------
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pages/device-info/index.vue b/pages/device-info/index.vue
index 1fa6aa4..42daae0 100644
--- a/pages/device-info/index.vue
+++ b/pages/device-info/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="content">
-    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="授信记录"></uni-nav-bar>
+    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="设备信息"></uni-nav-bar>
     <view class="flex-col group_4">
       <view class="flex-col group_5">
         <view class="flex-col items-center group_6">
diff --git a/pages/device-operation/index.vue b/pages/device-operation/index.vue
index c93fe4d..7815963 100644
--- a/pages/device-operation/index.vue
+++ b/pages/device-operation/index.vue
@@ -26,7 +26,7 @@
           <text class="text_2">设备名称</text>
         </view>
         <qn-easyinput
-          :maxlength="20"
+          :maxlength="10"
           v-model="form.name"
           :inputBorder="false"
           text="right"
@@ -72,7 +72,7 @@
           <text class="text_2">设备描述</text>
         </view>
         <qn-easyinput
-          :maxlength="200"
+          :maxlength="100"
           v-model="form.machineDescribe"
           type="textarea"
           placeholderStyle="fontSize: 28rpx "
diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue
index fe73933..147ba66 100644
--- a/pages/digital-workshops/index.vue
+++ b/pages/digital-workshops/index.vue
@@ -468,6 +468,9 @@ export default {
           white-space: nowrap;
         }
         .text_24 {
+          width: 170rpx;
+          overflow: hidden;
+          text-overflow: ellipsis;
           color: rgb(31, 31, 31);
           font-size: 28rpx;
           font-weight: 500;
diff --git a/pages/login/index.vue b/pages/login/index.vue
index e2f5138..9585564 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -19,7 +19,7 @@
         <uni-easyinput v-model="captcha" :inputBorder="false" :placeholderStyle="'font-size:32rpx;'" placeholder="请输入验证码" :maxlength="6" type="number" />
         <view v-show="timer > 0" class="timer_area">
           <text class="timer">{{ `(${timer}S后) ` }}</text>
-          <text class="timer_text" @click="getCode">重新获取</text>
+          <text class="timer_text">重新获取</text>
         </view>
         <text v-show="timer <= 0" class="code" @click="getCode">获取验证码</text>
       </view>
@@ -230,7 +230,7 @@ export default {
         font-size: 32rpx;
         color: #007aff;
       }
-      .timer_area {
+      .timer_text {
         font-size: 32rpx;
         color: #999999;
       }
diff --git a/pages/production-operation/index.vue b/pages/production-operation/index.vue
index 4ee0d5c..b975175 100644
--- a/pages/production-operation/index.vue
+++ b/pages/production-operation/index.vue
@@ -26,7 +26,7 @@
           <text class="text_2">产品名称</text>
         </view>
         <qn-easyinput
-          :maxlength="20"
+          :maxlength="10"
           v-model="form.name"
           :inputBorder="false"
           text="right"
@@ -41,7 +41,7 @@
           <text class="text_2">产品描述</text>
         </view>
         <qn-easyinput
-          :maxlength="200"
+          :maxlength="100"
           v-model="form.produceDescribe"
           type="textarea"
           placeholderStyle="fontSize: 28rpx "
diff --git a/pages/promotion/index.vue b/pages/promotion/index.vue
index f8bb22d..62de676 100644
--- a/pages/promotion/index.vue
+++ b/pages/promotion/index.vue
@@ -77,11 +77,11 @@
         <text class="text_13">立即分享给好友</text>
         <view class="flex-col group_20">
           <view class="justify-between group_21">
-            <view class="flex-col items-center" @click="share('WXSceneSession')">
+            <view class="flex-col items-center" @click="shareFactory('WXSceneSession')">
               <image src="/static/imgs/general/session-share-icon.png" class="image_14" />
               <text class="text_14">微信好友</text>
             </view>
-            <view class="flex-col group_23" @click="share('WXSceneTimeline')">
+            <view class="flex-col group_23" @click="shareFactory('WXSceneTimeline')">
               <image src="/static/imgs/general/line-share-icon.png" class="image_15" />
               <text class="text_15">朋友圈</text>
             </view>
@@ -102,7 +102,7 @@ import { go2 } from '@/utils/hook.js'
 import { getFactoryInfo } from '@/apis/factoryApi.js'
 import { getEquipmentList } from '@/apis/deviceApi.js'
 import { getProductionList } from '@/apis/productionApi.js'
-import { fileType } from '@/enums/index.js'
+import { fileType, H5_URL_FACTORY } from '@/enums/index.js'
 export default {
   components: {
     Banner
@@ -260,11 +260,11 @@ export default {
       uni.share({
         provider: 'weixin',
         type: 0,
-        title: factoryInfo.name,
+        title: this.factoryInfo.name,
         summary: '印包客支持远程验厂，在线了解工厂',
         scene: scene, // WXSceneTimeline,WXSceneSession
         imageUrl: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/wx-share-store.png',
-        href: H5_URL_FACTORY + `shareId=${res}`,
+        href: H5_URL_FACTORY + `shareId=${this.factoryInfo.id}`,
         success: () => {
           console.log('分享成功')
         },
@@ -328,11 +328,12 @@ export default {
         }
       }
       .text_1 {
+        width: 600rpx;
         color: rgb(0, 0, 0);
         font-size: 36rpx;
         font-weight: 500;
         line-height: 50rpx;
-        white-space: nowrap;
+        white-space: break-all;
       }
       .group_6 {
         margin: 7rpx 7rpx 7rpx 0;