From 65a3dd62a85bde4f0ac3e5579725c0ed9c3f1a30 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Thu, 31 Mar 2022 10:36:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=85=A8=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/deviceApi.js                            |  12 +-
 manifest.json                                |   8 +-
 pages.json                                   |  16 +
 pages/complete-info/EnterpriseForm.vue       |   2 +-
 pages/device-info/index.vue                  |   2 +-
 pages/device-operation/index.vue             |   8 +-
 pages/device-production-detail/index.vue     |  15 +-
 pages/digital-workshops/index.vue            |   4 -
 pages/production-info/index.vue              | 177 ++++++++
 pages/production-operation/index.vue         | 405 +++++++++++++++++++
 pages/promotion/Banner.vue                   |   5 +-
 pages/promotion/index.vue                    |  58 +--
 static/imgs/general/left-arrow-blue-icon.png | Bin 0 -> 899 bytes
 static/imgs/general/share-black-icon.png     | Bin 0 -> 3336 bytes
 static/imgs/general/share-gray-icon.png      | Bin 0 -> 2993 bytes
 static/imgs/promotion/add-icon.png           | Bin 0 -> 1729 bytes
 static/imgs/promotion/address-icon.png       | Bin 0 -> 1263 bytes
 static/imgs/promotion/phone-blue-icon.png    | Bin 0 -> 1107 bytes
 18 files changed, 658 insertions(+), 54 deletions(-)
 create mode 100644 pages/production-info/index.vue
 create mode 100644 pages/production-operation/index.vue
 create mode 100644 static/imgs/general/left-arrow-blue-icon.png
 create mode 100644 static/imgs/general/share-black-icon.png
 create mode 100644 static/imgs/general/share-gray-icon.png
 create mode 100644 static/imgs/promotion/add-icon.png
 create mode 100644 static/imgs/promotion/address-icon.png
 create mode 100644 static/imgs/promotion/phone-blue-icon.png

diff --git a/apis/deviceApi.js b/apis/deviceApi.js
index 20a3bca..4059a44 100644
--- a/apis/deviceApi.js
+++ b/apis/deviceApi.js
@@ -65,7 +65,7 @@ export function makeDeviceShare(data = {}) {
  */
 export function getEquipmentList(data = {}) {
   return http.get({
-    url: '/base-paper-trading/get/mechanical-equipment/list',
+    url: '/base-paper-trading/get/mechanical-equipment/extension-list',
     data
   })
 }
@@ -79,3 +79,13 @@ export function getEquipmentInfo(data = {}) {
     data
   })
 }
+
+/**
+ * 获取监控设备的token
+ */
+export function getAccessToken(data = {}) {
+  return http.get({
+    url: `/base-paper-trading/get/mechanical-equipment/monitor/token`,
+    data
+  })
+}
diff --git a/manifest.json b/manifest.json
index e667c99..a609bb8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -78,8 +78,8 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wxbdd9c878b33e451d",
-                        "UniversalLinks" : "https://apple-app-yyt-shopkeeper.qniao.cn/"
+                        "appid" : "wx6c66084e2de41575",
+                        "UniversalLinks" : "https://apple-app-yyt-printpackage.qniao.cn/"
                     }
                 },
                 "ad" : {},
@@ -92,8 +92,8 @@
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wxbdd9c878b33e451d",
-                        "UniversalLinks" : "https://apple-app-yyt-shopkeeper.qniao.cn/"
+                        "appid" : "wx6c66084e2de41575",
+                        "UniversalLinks" : "https://apple-app-yyt-printpackage.qniao.cn/"
                     }
                 },
                 "push" : {
diff --git a/pages.json b/pages.json
index 58ba348..85cb60e 100644
--- a/pages.json
+++ b/pages.json
@@ -51,6 +51,22 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/production-operation/index",
+      "style": {
+        "navigationBarTitleText": "产品操作",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/production-info/index",
+      "style": {
+        "navigationBarTitleText": "产品信息",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/mall/index",
       "style": {
diff --git a/pages/complete-info/EnterpriseForm.vue b/pages/complete-info/EnterpriseForm.vue
index 6193814..dc03142 100644
--- a/pages/complete-info/EnterpriseForm.vue
+++ b/pages/complete-info/EnterpriseForm.vue
@@ -8,7 +8,7 @@
       <text v-show="!form.businessLicenseImg" class="text_3" @click="selectImg('businessLicenseImg')">点击上传</text>
       <view v-show="form.businessLicenseImg" class="flex-row">
         <text class="text_3" @click="preview(form.businessLicenseImg)">预览</text>
-        <text class="text_3" style="color: #f5222d; margin-left: 16rpx" @click="selectImg('businessLicenseImg')">重新上传</text>
+        <text v-if="operation == 'add'" class="text_3" style="color: #f5222d; margin-left: 16rpx" @click="selectImg('businessLicenseImg')">重新上传</text>
       </view>
     </view>
     <view class="divider"></view>
diff --git a/pages/device-info/index.vue b/pages/device-info/index.vue
index e6592bb..d5e52a9 100644
--- a/pages/device-info/index.vue
+++ b/pages/device-info/index.vue
@@ -48,7 +48,7 @@ export default {
       this.id = options.id
     }
   },
-  created() {
+  onShow() {
     if (this.id) {
       getEquipmentInfo({ id: this.id }).then((res) => {
         if (res) {
diff --git a/pages/device-operation/index.vue b/pages/device-operation/index.vue
index 750accc..c93fe4d 100644
--- a/pages/device-operation/index.vue
+++ b/pages/device-operation/index.vue
@@ -174,11 +174,6 @@ export default {
       placeholderStyle: 'font-size: 28rpx;font-weight:400;'
     }
   },
-  watch: {
-    'form.type'(val) {
-      console.log('val:', val)
-    }
-  },
   onLoad(options) {
     if (options.operation) {
       this.operation = options.operation
@@ -224,7 +219,7 @@ export default {
           Object.keys(this.form).forEach((key) => {
             this.form[key] = res[key]
           })
-          this.form.technicsTypeList = res.technicsTypeList.map((item) => item.id + '')
+          this.form.technicsTypeList = res.technicsTypeList.map((item) => item.id)
         }
       })
     },
@@ -276,6 +271,7 @@ export default {
       }
       let list = this.technicsTypeList.filter((item) => this.form.technicsTypeList.includes(item.value))
       let technicsTypeList = list.map((item) => ({ id: item.value, name: item.label }))
+      this.form.typeName = this.deviceTypeList.find((item) => item.value == this.form.type).label
       changeDevice({ ...this.form, technicsTypeList }).then((res) => {
         if (res) {
           uni.showToast({
diff --git a/pages/device-production-detail/index.vue b/pages/device-production-detail/index.vue
index c69aab8..f9eab52 100644
--- a/pages/device-production-detail/index.vue
+++ b/pages/device-production-detail/index.vue
@@ -98,7 +98,7 @@
 <script>
 import { go2, back } from '@/utils/hook.js'
 import { round } from '@/utils/index.js'
-import { getDeviceList, makeDeviceShare } from '@/apis/deviceApi.js'
+import { getDeviceList, makeDeviceShare, getAccessToken } from '@/apis/deviceApi.js'
 import { H5_URL_DEVICE, isEncrypt, YINGSHI_LIVE_URL } from '@/enums/index.js'
 export default {
   data() {
@@ -183,9 +183,16 @@ export default {
     },
     palyVideo() {
       if (this.curDevice) {
-        this.curDevice.accessToken = 'at.1bi93a6k73ochhe60yo0tl3h15b4atv1-8kz22w16z4-1vni1th-smig38b8n'
-        let url = YINGSHI_LIVE_URL + `accessToken=${this.curDevice.accessToken}&deviceSerial=${this.curDevice.cameraId}&channelNo=${this.curDevice.channelNum}`
-        go2('page-view', { url: encodeURIComponent(url) })
+        getAccessToken().then((res) => {
+          if (res) {
+            console.log('res', res)
+            // this.curDevice.accessToken = 'at.1bi93a6k73ochhe60yo0tl3h15b4atv1-8kz22w16z4-1vni1th-smig38b8n'
+            this.curDevice.accessToken = res
+            let url =
+              YINGSHI_LIVE_URL + `accessToken=${this.curDevice.accessToken}&deviceSerial=${this.curDevice.cameraId}&channelNo=${this.curDevice.channelNum}`
+            go2('page-view', { url: encodeURIComponent(url) })
+          }
+        })
       }
     }
   },
diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue
index dc6d601..fe73933 100644
--- a/pages/digital-workshops/index.vue
+++ b/pages/digital-workshops/index.vue
@@ -455,10 +455,6 @@ export default {
         border-radius: 22rpx;
         box-shadow: 0 0 8rpx rgba(0, 0, 0, 0.1);
         background-color: rgb(255, 255, 255);
-        // background-image: url('https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16479425621806615216.png');
-        // background-position: 0px 0px;
-        // background-size: 100% 100%;
-        // background-repeat: no-repeat;
         .image_6 {
           margin-top: 20rpx;
           width: 296rpx;
diff --git a/pages/production-info/index.vue b/pages/production-info/index.vue
new file mode 100644
index 0000000..d5e52a9
--- /dev/null
+++ b/pages/production-info/index.vue
@@ -0,0 +1,177 @@
+<template>
+  <view class="content">
+    <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">
+          <swiper class="swiper" @change="changeSwiper">
+            <swiper-item v-for="(item, index) in info.imgItemList" :key="index">
+              <image mode="aspectFit" :src="item.url" class="image" @click="preview(item.url)" />
+            </swiper-item>
+          </swiper>
+          <view class="flex-col items-center text-wrapper">
+            <text>{{ swiperCurrent + 1 }}/{{ info.imgItemList.length }}</text>
+          </view>
+        </view>
+        <view class="flex-col section_1">
+          <text class="text_5">{{ info.name || '设备' }}</text>
+          <text class="text_6">
+            {{ info.machineDescribe || '没有描述' }}
+          </text>
+        </view>
+      </view>
+      <view class="flex-row section_2">
+        <view class="flex-col items-center text-wrapper_1" @click="deleteDevice">
+          <text>删除</text>
+        </view>
+        <view class="flex-col items-center text-wrapper_2" @click="go2('device-operation', { operation: 'edit', id: info.id })">
+          <text>编辑</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { go2, back } from '@/utils/hook.js'
+import { getEquipmentInfo } from '@/apis/deviceApi.js'
+export default {
+  data() {
+    return {
+      info: { imgItemList: [] },
+      id: null,
+      swiperCurrent: 1
+    }
+  },
+  onLoad(options) {
+    if (options.id) {
+      this.id = options.id
+    }
+  },
+  onShow() {
+    if (this.id) {
+      getEquipmentInfo({ id: this.id }).then((res) => {
+        if (res) {
+          this.info = res
+        }
+      })
+    }
+  },
+  methods: {
+    go2,
+    back,
+    changeSwiper(e) {
+      this.swiperCurrent = e.detail.current
+    },
+    preview(url) {
+      let urls = info.imgItemList.map((img) => img.url)
+      uni.previewImage({
+        current: url,
+        urls: urls
+      })
+    },
+    // 删除当前设备
+    deleteDevice() {}
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 750rpx;
+  .group_4 {
+    flex: 1 1 auto;
+    overflow-y: auto;
+    .group_5 {
+      .group_6 {
+        width: 750rpx;
+        height: 440rpx;
+        .swiper {
+          width: 100%;
+          height: 100%;
+          .image {
+            width: 100%;
+            height: 100%;
+            background-color: rgb(0, 0, 0);
+          }
+        }
+        color: rgb(255, 255, 255);
+        font-size: 28rpx;
+        line-height: 40rpx;
+        white-space: nowrap;
+        position: relative;
+
+        .text-wrapper {
+          background-color: rgba(0, 0, 0, 0.4);
+          border-radius: 20rpx;
+          width: 64rpx;
+          position: absolute;
+          right: 32rpx;
+          bottom: 60rpx;
+        }
+      }
+      .section_1 {
+        margin-top: -40rpx;
+        padding: 32rpx 30rpx 100rpx 32rpx;
+        background-image: linear-gradient(
+          180deg,
+          rgb(255, 255, 255) 0%,
+          rgb(255, 255, 255) 0%,
+          rgb(253, 253, 254) 30.62%,
+          rgba(247, 248, 250, 0) 100%,
+          rgba(247, 248, 250, 0) 100%
+        );
+        border-radius: 40rpx 40rpx 0px 0px;
+        position: relative;
+        .text_5 {
+          color: rgb(0, 0, 0);
+          font-size: 36rpx;
+          font-weight: 500;
+          line-height: 50rpx;
+          white-space: nowrap;
+        }
+        .text_6 {
+          margin-top: 20rpx;
+          color: rgb(51, 51, 51);
+          font-size: 26rpx;
+          line-height: 37rpx;
+          text-align: left;
+        }
+      }
+    }
+    .section_2 {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      padding: 16rpx 28rpx;
+      background-color: rgb(255, 255, 255);
+      .text-wrapper_1 {
+        padding: 21rpx 0;
+        color: rgb(245, 34, 45);
+        font-size: 30rpx;
+        font-weight: 500;
+        line-height: 42rpx;
+        white-space: nowrap;
+        border-radius: 10rpx;
+        width: 270rpx;
+        height: 88rpx;
+        border: solid 2rpx rgb(245, 34, 45);
+      }
+      .text-wrapper_2 {
+        margin-left: 24rpx;
+        padding: 23rpx 0;
+        flex: 1 1 auto;
+        color: rgb(255, 255, 255);
+        font-size: 30rpx;
+        font-weight: 500;
+        line-height: 42rpx;
+        white-space: nowrap;
+        background-color: rgb(0, 122, 255);
+        border-radius: 10rpx;
+        height: 88rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/production-operation/index.vue b/pages/production-operation/index.vue
new file mode 100644
index 0000000..c93fe4d
--- /dev/null
+++ b/pages/production-operation/index.vue
@@ -0,0 +1,405 @@
+<template>
+  <view class="content">
+    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed :title="operation == 'add' ? '新增设备' : '编辑设备'"></uni-nav-bar>
+    <view class="form">
+      <view class="flex-col group_9">
+        <view class="flex-row group_10">
+          <text class="text_18">*</text>
+          <text class="text_19">设备图片</text>
+          <text class="tip">(图片单张大小不超过2M，数量最多5张)</text>
+        </view>
+        <view class="flex-row">
+          <view v-for="(item, index) in form.imgItemList" :key="item.url" class="image-area">
+            <image class="image__close-icon" @click="clearImage(index)" src="/static/imgs/general/close-icon.png"></image>
+            <image :src="item.url" class="upload_image" @click="preview(item.url)"></image>
+          </view>
+          <view v-show="form.imgItemList.length < 5" class="flex-col items-center section_4" @click="selectImg">
+            <image src="/static/imgs/general/camera-icon.png" class="image_6" />
+            <text class="text_20">点击上传</text>
+          </view>
+        </view>
+      </view>
+      <view class="divider"></view>
+      <view class="justify-between group">
+        <view class="flex-row">
+          <text class="text_1">*</text>
+          <text class="text_2">设备名称</text>
+        </view>
+        <qn-easyinput
+          :maxlength="20"
+          v-model="form.name"
+          :inputBorder="false"
+          text="right"
+          placeholderStyle="fontSize: 28rpx"
+          placeholder="请输入设备名称"
+        ></qn-easyinput>
+      </view>
+      <view class="divider"></view>
+      <view class="justify-between group">
+        <view class="flex-row">
+          <text class="text_2">设备类型</text>
+        </view>
+        <view style="width: 400rpx; z-index: 2">
+          <qn-select
+            :placeholderStyle="placeholderStyle"
+            contentStyle="background: none; padding: 0;text-align: right;"
+            :options="deviceTypeList"
+            v-model="form.type"
+            placeholder="请选择设备类型"
+          ></qn-select>
+        </view>
+      </view>
+      <view class="divider"></view>
+      <view class="justify-between group">
+        <view class="flex-row">
+          <text class="text_2">生产工艺</text>
+        </view>
+        <view style="width: 400rpx; z-index: 1">
+          <qn-select
+            :placeholderStyle="placeholderStyle"
+            contentStyle="background: none; padding: 0;text-align: right;"
+            :options="technicsTypeList"
+            v-model="form.technicsTypeList"
+            placeholder="请选择设备支持的生产类型"
+            multiple
+          ></qn-select>
+        </view>
+      </view>
+      <view class="divider"></view>
+      <view class="group">
+        <view class="flex-row">
+          <text class="text_1">*</text>
+          <text class="text_2">设备描述</text>
+        </view>
+        <qn-easyinput
+          :maxlength="200"
+          v-model="form.machineDescribe"
+          type="textarea"
+          placeholderStyle="fontSize: 28rpx "
+          placeholder="请输入设备介绍"
+          style="background-color: rgb(247, 248, 250); margin-top: 16rpx"
+        ></qn-easyinput>
+      </view>
+      <view class="divider"></view>
+      <view class="justify-between group">
+        <view class="flex-row">
+          <text class="text_2">摄像头ID</text>
+        </view>
+        <qn-easyinput
+          :maxlength="20"
+          v-model="form.cameraId"
+          :inputBorder="false"
+          text="right"
+          placeholderStyle=" fontSize: 28rpx"
+          placeholder="请输入摄像头ID"
+        ></qn-easyinput>
+      </view>
+      <view class="divider"></view>
+      <view class="justify-between group">
+        <view class="flex-row">
+          <text class="text_2">摄像头渠道号</text>
+        </view>
+        <qn-easyinput
+          :maxlength="20"
+          v-model="form.channelNum"
+          :inputBorder="false"
+          text="right"
+          type="number"
+          placeholderStyle=" fontSize: 28rpx"
+          placeholder="请输入摄像头渠道号"
+        ></qn-easyinput>
+      </view>
+      <view class="divider"></view>
+      <view class="justify-between group">
+        <view class="flex-row">
+          <text class="text_2">云盒ID</text>
+        </view>
+        <qn-easyinput
+          :maxlength="20"
+          v-model="form.cloudBoxId"
+          :inputBorder="false"
+          text="right"
+          placeholderStyle=" fontSize: 28rpx"
+          placeholder="请输入云盒ID"
+        ></qn-easyinput>
+      </view>
+    </view>
+    <qn-footer fixed>
+      <view class="flex-col items-center text-wrapper_1" @click="save">
+        <text>保存</text>
+      </view>
+    </qn-footer>
+  </view>
+</template>
+
+<script>
+import { go2, back, uploadImage } from '@/utils/hook.js'
+import { validateField } from '@/utils/index.js'
+import { fileType } from '@/enums/index.js'
+import { getDeviceTypeList, getTechnicsList, changeDevice, getEquipmentInfo } from '@/apis/deviceApi.js'
+
+const validateFields = [
+  {
+    name: 'imgItemList',
+    rules: [{ required: true, message: '请上传设备图片' }]
+  },
+  {
+    name: 'name',
+    rules: [{ required: true, message: '请输入设备名称' }]
+  },
+  {
+    name: 'machineDescribe',
+    rules: [{ required: true, message: '请输入设备描述' }]
+  }
+]
+
+export default {
+  data() {
+    return {
+      operation: 'add', // add:新增, edit:编辑
+      deviceId: null,
+      form: {
+        id: null,
+        imgItemList: [],
+        machineDescribe: '',
+        cameraId: '',
+        channelNum: '',
+        cloudBoxId: '',
+        name: '',
+        type: '',
+        technicsTypeList: []
+      },
+      deviceTypeList: [],
+      technicsTypeList: [],
+      placeholderStyle: 'font-size: 28rpx;font-weight:400;'
+    }
+  },
+  onLoad(options) {
+    if (options.operation) {
+      this.operation = options.operation
+      if (options.operation == 'edit') {
+        this.init(options.id)
+      }
+    } else {
+      uni.showToast({
+        title: '参数错误，即将返回',
+        icon: 'error',
+        duration: 2000,
+        mask: true,
+        success: () => {
+          setTimeout(() => {
+            back()
+          }, 2000)
+        }
+      })
+    }
+  },
+  created() {
+    getDeviceTypeList().then((res) => {
+      if (res) {
+        this.deviceTypeList = res.map((item) => ({ label: item.name, value: item.id }))
+      }
+    })
+    getTechnicsList().then((res) => {
+      if (res) {
+        this.technicsTypeList = res.map((item) => ({ label: item.name, value: item.id }))
+      }
+    })
+  },
+  methods: {
+    go2,
+    back,
+    clearImage(index) {
+      this.form.imgItemList.splice(index, 1)
+    },
+    // 编辑初始化
+    init(id) {
+      getEquipmentInfo({ id }).then((res) => {
+        if (res) {
+          Object.keys(this.form).forEach((key) => {
+            this.form[key] = res[key]
+          })
+          this.form.technicsTypeList = res.technicsTypeList.map((item) => item.id)
+        }
+      })
+    },
+    preview(url) {
+      uni.previewImage({
+        urls: [url],
+        current: url
+      })
+    },
+    selectImg() {
+      uploadImage()
+        .then((urls) => {
+          if (urls) {
+            this.form.imgItemList.push({
+              url: urls[0],
+              type: fileType.IMG
+            })
+          }
+        })
+        .catch((e) => {
+          uni.showToast({
+            title: '上传失败:' + (e.message || e),
+            icon: 'fail',
+            duration: 1500
+          })
+        })
+    },
+    save() {
+      for (let field of validateFields) {
+        const { name, rules } = field
+        const value = this.form[name]
+        const { isValid, msg } = validateField(value, rules)
+        if (!isValid) {
+          uni.showToast({
+            title: msg,
+            icon: 'none'
+          })
+          return false
+        }
+      }
+      if (this.form.cameraId) {
+        if (!this.form.channelNum) {
+          uni.showToast({
+            title: '请输入摄像头渠道号',
+            icon: 'none'
+          })
+          return false
+        }
+      }
+      let list = this.technicsTypeList.filter((item) => this.form.technicsTypeList.includes(item.value))
+      let technicsTypeList = list.map((item) => ({ id: item.value, name: item.label }))
+      this.form.typeName = this.deviceTypeList.find((item) => item.value == this.form.type).label
+      changeDevice({ ...this.form, technicsTypeList }).then((res) => {
+        if (res) {
+          uni.showToast({
+            title: '保存成功',
+            icon: 'success',
+            duration: 1500
+          })
+          setTimeout(() => {
+            back()
+          }, 1500)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.form {
+  width: 750rpx;
+  background-color: #fff;
+}
+.group {
+  padding: 24rpx 28rpx 24rpx 32rpx;
+  font-size: 28rpx;
+  line-height: 40rpx;
+  white-space: nowrap;
+  .text_3 {
+    color: rgb(0, 122, 255);
+  }
+  .text_1 {
+    color: rgb(245, 34, 45);
+  }
+  .text_2 {
+    margin-left: 4rpx;
+    color: rgb(0, 0, 0);
+  }
+}
+.divider {
+  margin: 0 28rpx;
+  background-color: rgb(216, 216, 216);
+  height: 2rpx;
+}
+.group_9 {
+  padding: 22rpx 32rpx 32rpx;
+  .group_10 {
+    padding-bottom: 16rpx;
+    .text_18 {
+      color: rgb(245, 34, 45);
+      font-size: 28rpx;
+      line-height: 40rpx;
+      white-space: nowrap;
+    }
+    .text_19 {
+      margin-left: 4rpx;
+      color: rgb(0, 0, 0);
+      font-size: 28rpx;
+      line-height: 40rpx;
+      white-space: nowrap;
+    }
+    .tip {
+      margin-left: 16rpx;
+      font-size: 24rpx;
+      line-height: 40rpx;
+      color: #858585;
+    }
+  }
+  .section_4 {
+    margin-left: 19rpx;
+    padding: 23rpx 0 13rpx;
+    color: rgb(76, 74, 88);
+    font-size: 26rpx;
+    line-height: 37rpx;
+    white-space: nowrap;
+    background-color: rgba(220, 222, 224, 0.5);
+    border-radius: 10rpx;
+    width: 120rpx;
+    .image_6 {
+      width: 42rpx;
+      height: 36rpx;
+    }
+    .text_20 {
+      margin-top: 12rpx;
+    }
+  }
+}
+.upload_image {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 10rpx;
+}
+.video-area {
+  position: relative;
+  width: 686rpx;
+  .video__close-icon {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 32rpx;
+    height: 32rpx;
+    z-index: 100;
+  }
+  .video {
+    width: 686rpx;
+    height: 450rpx;
+  }
+}
+.image-area {
+  position: relative;
+  margin-left: 19rpx;
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 10rpx;
+
+  .image__close-icon {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 32rpx;
+    height: 32rpx;
+    z-index: 1;
+  }
+}
+.text-wrapper_1 {
+  margin: 0 32rpx;
+  padding: 23rpx 0;
+  background-color: rgb(0, 122, 255);
+  border-radius: 10rpx;
+  color: rgb(255, 255, 255);
+}
+</style>
diff --git a/pages/promotion/Banner.vue b/pages/promotion/Banner.vue
index b8112ab..3e459c2 100644
--- a/pages/promotion/Banner.vue
+++ b/pages/promotion/Banner.vue
@@ -11,10 +11,7 @@
         </view>
       </swiper-item>
     </swiper>
-    <image
-      src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16484397546890459564.png"
-      class="image_1"
-    />
+    <image src="/static/imgs/general/share-gray-icon.png" class="image_1" />
     <view class="flex-col items-center text-wrapper">
       <text>{{ swiperCurrent + 1 }}/{{ list.length }}</text>
     </view>
diff --git a/pages/promotion/index.vue b/pages/promotion/index.vue
index 34daef2..a418fd8 100644
--- a/pages/promotion/index.vue
+++ b/pages/promotion/index.vue
@@ -6,10 +6,7 @@
         <text class="text">{{ factoryInfo.name || '-' }}</text>
         <view class="flex-row group_1">
           <text class="text_1">分享</text>
-          <image
-            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16486138596948699331.png"
-            class="image"
-          />
+          <image src="/static/imgs/general/share-black-icon.png" class="image" />
         </view>
       </view>
       <Banner :list="swiperList"></Banner>
@@ -20,25 +17,16 @@
               <text class="text_1">{{ factoryInfo.name || '-' }}</text>
               <view class="flex-row group_6" @click="editFactory">
                 <text>修改</text>
-                <image
-                  src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16484397523702242367.png"
-                  class="image_2"
-                />
+                <image src="/static/imgs/general/left-arrow-blue-icon.png" class="image_2" />
               </view>
             </view>
             <view class="flex-col group_7">
               <view class="flex-row">
-                <image
-                  src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16484397546883580497.png"
-                  class="image_3"
-                />
+                <image src="/static/imgs/promotion/phone-blue-icon.png" class="image_3" />
                 <text class="text_3">{{ factoryInfo.contactName || '-' }} {{ factoryInfo.contactMobile }}</text>
               </view>
               <view class="flex-row group_9">
-                <image
-                  src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16484397546889037530.png"
-                  class="image_4"
-                />
+                <image src="/static/imgs/promotion/address-icon.png" class="image_4" />
                 <text class="text_4">{{ factoryInfo.locProvinceName + factoryInfo.locCityName + factoryInfo.locDistrictName + factoryInfo.locDetail }}</text>
               </view>
             </view>
@@ -60,26 +48,20 @@
           </view>
           <view v-if="curTab == 'device'">
             <view class="flex-col section_3" v-for="(item, index) in deviceList" :key="index" @click="go2('device-info', { id: item.id })">
-              <image
-                src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16484397512933663615.png"
-                class="image_5"
-              />
+              <image mode="aspectFit" @click.stop="preview(item)" :src="item.imgItemList[0].url" class="image_5" />
               <view class="flex-col">
                 <view class="justify-between group_13">
                   <text class="text_8">{{ item.name }}</text>
                 </view>
                 <text class="text_9">
-                  {{ item.cameraId }}
+                  {{ item.machineDescribe }}
                 </text>
               </view>
             </view>
           </view>
           <view class="observer">{{ hasMore ? '加载中～' : '没有更多～' }}</view>
         </view>
-        <image
-          src="https://project-user-resource-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16484397546886233508.png"
-          class="image_6"
-        />
+        <image @click="addItem" src="/static/imgs/promotion/add-icon.png" class="image_6" />
       </view>
     </view>
   </view>
@@ -130,7 +112,7 @@ export default {
       this.getList()
     }
   },
-  created() {
+  onShow() {
     this.getCompanyInfo()
     this.getList()
   },
@@ -200,9 +182,6 @@ export default {
           if (res) {
             if (res.current <= 1) {
               this.deviceList = res.records
-              for (let i = 0; i < 3; i++) {
-                this.deviceList = [...this.deviceList, ...this.deviceList]
-              }
             } else {
               this.deviceList = this.deviceList.concat(res.records)
             }
@@ -222,6 +201,24 @@ export default {
           }
         })
       }
+    },
+    preview(device) {
+      let urls = device.imgItemList.map((item) => {
+        return item.url
+      })
+      uni.previewImage({
+        current: 0,
+        urls
+      })
+    },
+    // 添加设备或产品
+    addItem() {
+      if (this.curTab == 'device') {
+        go2('device-operation', { operation: 'add' })
+      }
+      if (this.curTab == 'production') {
+        go2('production-operation', { operation: 'add' })
+      }
     }
   }
 }
@@ -328,11 +325,13 @@ export default {
         background-color: rgb(255, 255, 255);
         border-radius: 10rpx;
         .image_5 {
+          background-color: rgb(0, 0, 0);
           margin-right: 24rpx;
           width: 638rpx;
           height: 390rpx;
         }
         .group_13 {
+          margin-top: 20rpx;
           color: rgb(0, 0, 0);
           font-size: 32rpx;
           font-weight: 600;
@@ -343,6 +342,7 @@ export default {
           }
         }
         .text_9 {
+          margin-top: 12rpx;
           margin-right: 40rpx;
           color: rgb(51, 51, 51);
           font-size: 26rpx;
diff --git a/static/imgs/general/left-arrow-blue-icon.png b/static/imgs/general/left-arrow-blue-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a664d7ca96bff77a971a2e1e9ed35017fd2097bd
GIT binary patch
literal 899
zcmV-}1AP36P)<h;3K|Lk000e1NJLTq000yK001Ni1^@s6iSrtu00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR916rckD1ONa40RR91Bme*a02BO3djJ3e?MXyIR7ee_mOW?`Q4q&xE+2|0
zA}9!gLW(pNX>8J{Tn<AdU_gi{0fj^mt+a}FyKrzhv9dBL42VJqc!Ho}L`kAalO~OY
z78U^oK@b!{#N3%1|L<;JvTw5PeH}b@XLjcI{_oA~+aqfAmzJB9k#&qK2E{G$Jh@I~
zx)U&j5;WR8(35L`-E{;p6`KR5WelKu7&?DaJDdq44PQo}>>-&2hJQ@=X@bVu!@ipL
zz6{d_JwTibBbuQOx=hSczd}!jpz1M(D}v$cq4PA%8%B_x$@sSaJUI=}qX^hjD7#=`
zCb70cPf`Fq$Jpu2#PkxdA<A+w?2iZfasmaI18i3~3HJ-sNrQm>QT`Z(zVrh28nE3?
z64Nr24FLAr@drk<!i*dPXdW?pRniKSodWEa@^6~kfxh&hHQpd%-)5A#VOpg<l%jF|
z>G+l5R@s-MSf){?Vehca{#r1@-cp#AZYt3dmU>W4`T@ImlG6N5`6JD$!mM-wwip5X
zh&}787iMN)%F1EDmH|7Wrd-3*<CNzw${%aCQ;}XFLc`VpOEwBKGr2_x&)pH)->|>N
zeFA&bkJL{pZU>Yv;8;JT{58!4n)EYTA_=J8t1j&8BKBBUJr){Nnb!j7R~6k|QF==b
zDF1)Wtv)m%)y94cW&52BCezqStmeDpk1*V#<oG?xltSDOCsuHTme38iMZeolm@!<1
z_Hhe`gR9U2^SnxJIHH*JsnQFjFHk6bKHAKfKFsk7o(=-)o_m6~r%2BLbx-gB8LiOH
zm*XV>&tT}2xerR80NQCo?KK`~q9%AAz_S?6w*#Fp0B8YF=POtnScT33cn;&QRZ_VM
z)R$<M3esl%(N(rj^|kt;pM`r95QNO&6~2f*E!U^ef^%E|>JpTett+^WK<PAzaAOKB
z#gkDWr(wGJOjEAICe(Ay$W;_((g{W38e4KWJI_<-(;Fd|KyT$=Y{=KdZAQi^Ek*m6
Z_#ef)(5HTeQ#t?u002ovPDHLkV1m}sf3E-l

literal 0
HcmV?d00001

diff --git a/static/imgs/general/share-black-icon.png b/static/imgs/general/share-black-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6779b8bdff9210a5b187a2c940dfcdbe0fe5bd0
GIT binary patch
literal 3336
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
SDd^k)0000<MNUMnLSTaJNgh1_

literal 0
HcmV?d00001

diff --git a/static/imgs/general/share-gray-icon.png b/static/imgs/general/share-gray-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1129b54e2451f321a0c8fec500415e632775408f
GIT binary patch
literal 2993
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

literal 0
HcmV?d00001

diff --git a/static/imgs/promotion/add-icon.png b/static/imgs/promotion/add-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..598e5d4f27b5b97f39daec97edf7b64a0dde90b8
GIT binary patch
literal 1729
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
Xd$YVTHie1g00000NkvXXu0mjf-f9wG

literal 0
HcmV?d00001

diff --git a/static/imgs/promotion/address-icon.png b/static/imgs/promotion/address-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eb5fdcd0634b3b387f804450041486eacecd0fa
GIT binary patch
literal 1263
zcmV<L1Q7d)P)<h;3K|Lk000e1NJLTq000{R0015c1^@s6-5F)(00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZtnMp)JR7i=fmP>3@WfaGM=etunkJ85SFx5a}FouNz
z6B95&A_Qeap|rG$aYLdOl*q!wnE_%P1?m)|#s_MBY|yAUcBT@M7$Q^>Uu+=8#03x$
z1p<u(Y3I>l?maGgXF8p^)7pfy`p*BJbAI2s-{W3k3hUaZ4Ta%st3aFLEE2d4l^KX!
z1U(CK2qBe>1pl6@mehLC-KTX!*G8X0?dJt%Pf;ch^jVI*E3sqd(6nIfuME!>$4a8Q
ztU5t*igN>GW>unc$uhD&5ec5~s%t8Rjy>rXvCS_PpdUrdCd+6`e>50KMjILnl4%55
zK|Tc>cP1^iGT7OhT{UHAD`J26oBg*Af-ZGuI-(*^rlP^my^@R8wKso{?Gz4x-sMVH
z3u-MrxZQuIW@oefbHhcDs$RFOy5&=W021LDr$#k@AIM2pYW7k1ux4jnJvzrW>9eJ^
z5UVX2@gJNDRBo;D?EE_HQ-a(AAci&l;m|i#o!M6Qu_8z?ho=hy_&ORmZ`8b8^wnWY
z`STJ?m9}wN-ta1>-E7uw{?u;L+ReAx&BDqU(-?SHVbpaWTpQD16-;1>JIa_`{V^{P
z@E$N92m-5tqxv|_<#CCvG9qx?bpv&Q?4k*<uDCYA*bEfsuS87p9*ynr&|2`Z(L*2K
zg$^wfVEMXi<9LVWx<@j=Tu)WKbR8~@j8m%Z!U9)7+=Hoi5Ywu|jxgv66Mpaz7nFt$
zmnXmuZ<A5bQ|?S>cldMnSLGLY2AFu+3Li)xN6MwOF%2p_<hr)6K2*B8$~#Dv6^T^M
z^&`#zcOz^AUPM?eeRNmG)%&wg3%IXNjwha#tK(%|YwyunBAN3DK>!ij`y-)&stzZy
zwpTOrOy2oTL>d9aSZn&j{^~=W+9CfSj2}ql{kGkidH)x*BBnm8z{f=p$kB4p1Q>vo
z3+_eu)ph4sK2qy?hpIm%9yTkGdkfVETsJM|#+J&M39v*=@*-9z@b8$S_tp_gt%#|A
zGEhf6y+_p<D=wmnJkcL+Iz1^2pg-(CEm)5Lc>q;i)$Gq6>WW=y@C5aydnh~b>S#}`
zFGbDYg7$c3qX?g%YPr&hg01Tg?rgXWV{6nL$m~PQcBIHV$w+W(t(rAqB_O&VsB@)r
zg41f(H(W5InJ*YWPayJkG91{3h)xcRscH9TAGSn>zKjIED-Y<1r`G@nfY6wt!(gs}
zE^r~Ls=HFr&<o{xo$+*=4Wy!>uZo%h=<w&Ff_~<xb7XyQW=VNcG8#H0%5qA#hs-R3
z6h>8LQzd9aPkOxr0|En`@!aMTtZR4Xc5sRdEXHfoY!98pW{Dt!W%4;JS(%Ck_E*NM
zNNIU&?7gk=?0f*@`1GaXD-t-Ij0AtKOa@5q3|;Dv23LyZTWpYJ*$WpJrk)G_<Qcm?
zFo5d!Zq3Ge^mPE~h>u(YX#yNa%__&SfA=adUGs^#6T?x^86bsh@Ir%6k(@viV2n7&
zj5X;7orX==l=<w{J8dJFH*Zq)nkLXU7?Xm4%7%Dmi=+DJ_$7L?C^DkTz~WrswOCA?
Z{{Xb(x0F3BAbJ1*002ovPDHLkV1jD~OW^<j

literal 0
HcmV?d00001

diff --git a/static/imgs/promotion/phone-blue-icon.png b/static/imgs/promotion/phone-blue-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..39cdc305a4a4f1195c047f28e275b2ca7bdc2f4f
GIT binary patch
literal 1107
zcmV-Z1g!gsP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZs{YgYYR7i=fmThQTWfaGM=O%5F+f`)Z=q7B6AF3am
zx(=rdg@NMypwPr@1DP+BrmZg%>)NJOMv8MbW$R=U+GV<xs@U14n{HAVqQx&-9lkMj
zLn$JxFgv<+u6b#bd;CzE#U?lDR?nx)J^$zbJLkCv&J{Akvop2|r}Zw#I#k~oOqj0|
z6pQ~cWbUCVl(<tgISeeDd#6J8(dN?nTnDw5<0z|vn^6)7=YTU9oFKtxa+q;jpf5PN
zG*#mK9${6s#IbEK;M$)Btl=@hg)oj#0^9<uL3tcl0dxVoB+P{@peGdVMRlvqB_u4v
zy8l?yk{@&Db97(B!w9>8+i|d2y7)Zp=INMTqt?tR$++Ge@xw&iyl*%t$%R4z)K36t
z174CaVE{v{nHLJc0PelX9jlvX_Kf=ZTm8h<&tF<Yzt-Z>3@-`Oj=>gSzt-^RY=`Yr
zW5DtS6nuUnZr(Z^lsJIau?&lQP_AH5j<NyRigFeQo28pS)5X=Y9i^2LD#X(sje@!t
z07QhUNOS2iyS!Gj6bE78K^#0FU5sYj$Tz^(2I#1rK^D+5F6GU?#{^+~z?Y;L&>+Uu
zB(DK=h9E<QKnj=DkcNR4_i#qVe)W@3KNISwPwT0e^+kbNU?u0+lr}lQ7r;dW96dTK
z%3Za{K4-Cc+tDU-@4VCz;31T!fFe?Sr+(G}NSI0BeS{~kHi!a4MkG-3iy`ufZFj1d
z`x|5;tB^305@tjWG9+QVC?5ic(^D$+0H^<RsE8&3@a|6Bp~>XWKv9k!qYgFh?r(AZ
zVOJD@KFf_1ah?>b<q&7>bOu0Vd&wDu-8NQcN>U&Bf?AvpC_P-lK_x5sJ)bT;MKQP8
zrtqtcZf(jHeLJ5KfOK<Og5=#UY2eT{Nm%F>AZDYjuX-!mSO{9MsQE9dLb2yWtwT0?
z1$GPuN_Wmr_(JgtOH;3^GL|&V@Tbi(wjdyYw>`Q?(S|&Q_Fi%P^Zd!i@+p8PLgQsl
zHGgAvMFGTt&Y8IR=JB9JGY=Z%h`ZwMMv#F#z^BVnW#4*3Q)>a7R;fP&2H*l(i(Ijv
zJRQ;X1v>=r1+_Tkik<)-$pcQI(uc4CbcKy3iAZ3u+1!&C2;l2fcWNd+h*}%-=@t?q
zvM<tXzFcSz;y<887cRznnVsOpK@Fq2AP@jm@peStP^Fc^%i7)s`QVxkd)uR%EcBqj
z4cEgnR5#|FQoD!*%#WSws010gW}Fyp11(EVUf1>beCkM6#$FNF0a{joG$Rm*1k6rY
z#P<O3?44T9w6vmH4P^hOC?jI<Vx+nBR2sh+;9U4RCzmFtonDmnB9sH8VDt?J++WSt
Z{tH<NaNJfZ|IYvb002ovPDHLkV1n`40_Fe!

literal 0
HcmV?d00001