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 @@ 点击上传 预览 - 重新上传 + 重新上传 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 @@ + + 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 @@ + + + + + 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 @@ - + {{ swiperCurrent + 1 }}/{{ list.length }} 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 @@ {{ factoryInfo.name || '-' }} 分享 - + @@ -20,25 +17,16 @@ {{ factoryInfo.name || '-' }} 修改 - + - + {{ factoryInfo.contactName || '-' }} {{ factoryInfo.contactMobile }} - + {{ factoryInfo.locProvinceName + factoryInfo.locCityName + factoryInfo.locDistrictName + factoryInfo.locDetail }} @@ -60,26 +48,20 @@ - + {{ item.name }} - {{ item.cameraId }} + {{ item.machineDescribe }} {{ hasMore ? '加载中～' : '没有更多～' }} - + @@ -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 0000000..a664d7c Binary files /dev/null and b/static/imgs/general/left-arrow-blue-icon.png differ diff --git a/static/imgs/general/share-black-icon.png b/static/imgs/general/share-black-icon.png new file mode 100644 index 0000000..c6779b8 Binary files /dev/null and b/static/imgs/general/share-black-icon.png differ diff --git a/static/imgs/general/share-gray-icon.png b/static/imgs/general/share-gray-icon.png new file mode 100644 index 0000000..1129b54 Binary files /dev/null and b/static/imgs/general/share-gray-icon.png differ diff --git a/static/imgs/promotion/add-icon.png b/static/imgs/promotion/add-icon.png new file mode 100644 index 0000000..598e5d4 Binary files /dev/null and b/static/imgs/promotion/add-icon.png differ diff --git a/static/imgs/promotion/address-icon.png b/static/imgs/promotion/address-icon.png new file mode 100644 index 0000000..5eb5fdc Binary files /dev/null and b/static/imgs/promotion/address-icon.png differ diff --git a/static/imgs/promotion/phone-blue-icon.png b/static/imgs/promotion/phone-blue-icon.png new file mode 100644 index 0000000..39cdc30 Binary files /dev/null and b/static/imgs/promotion/phone-blue-icon.png differ