Browse Source

ui优化

devlop
mo-bai 3 years ago
parent
commit
20ae42da07
33 changed files with 209 additions and 186 deletions
  1. 2
      README.md
  2. 2
      apis/commonApi.js
  3. 2
      apis/deviceApi.js
  4. 2
      apis/mineApi.js
  5. 3
      components/business-components/factoryItem.vue
  6. 5
      components/qn-select/qn-select.vue
  7. 322
      manifest.json
  8. 2
      pages/agreement/index.vue
  9. 48
      pages/digital-workshops/index.vue
  10. 1
      pages/factory/index.vue
  11. 2
      pages/login/index.vue
  12. 2
      pages/promotion/index.vue
  13. 2
      pages/setting/index.vue
  14. BIN
      static/imgs/.DS_Store
  15. BIN
      static/imgs/digital-workshops/operation-icon.png
  16. BIN
      static/imgs/factory/.DS_Store
  17. BIN
      unpackage/res/icons/1024x1024.png
  18. BIN
      unpackage/res/icons/120x120.png
  19. BIN
      unpackage/res/icons/144x144.png
  20. BIN
      unpackage/res/icons/152x152.png
  21. BIN
      unpackage/res/icons/167x167.png
  22. BIN
      unpackage/res/icons/180x180.png
  23. BIN
      unpackage/res/icons/192x192.png
  24. BIN
      unpackage/res/icons/20x20.png
  25. BIN
      unpackage/res/icons/29x29.png
  26. BIN
      unpackage/res/icons/40x40.png
  27. BIN
      unpackage/res/icons/58x58.png
  28. BIN
      unpackage/res/icons/60x60.png
  29. BIN
      unpackage/res/icons/72x72.png
  30. BIN
      unpackage/res/icons/76x76.png
  31. BIN
      unpackage/res/icons/80x80.png
  32. BIN
      unpackage/res/icons/87x87.png
  33. BIN
      unpackage/res/icons/96x96.png

2
README.md

@ -1 +1 @@
印包 app
印包管家 app

2
apis/commonApi.js

@ -245,7 +245,7 @@ export function bindingReceiptCode(data = {}) {
}
/**
* 印包注销账号
* 印包管家注销账号
* @param {object} data
*/
export function cancelAccount(data = {}) {

2
apis/deviceApi.js

@ -41,7 +41,7 @@ export function getDeviceList(data = {}) {
}
/**
* 印包监控台获取设备类型统计数据
* 印包管家监控台获取设备类型统计数据
*/
export function getEquipmentStatistics(data = {}) {
return http.get({

2
apis/mineApi.js

@ -1,7 +1,7 @@
import http from '../utils/http/index.js'
/**
* 印包获取纸盘商订单统计
* 印包管家获取纸盘商订单统计
* @param {object} data
* @returns 订单统计
* swagger:http://api-ops-uec-test.qniao.cn/uec/swagger-ui/index.html?urls.primaryName=CustomerApi#/%E7%99%BB%E5%BD%95%E8%AE%A4%E8%AF%81/authorizeByCaptchaUsingPOST

3
components/business-components/factoryItem.vue

@ -4,7 +4,7 @@
<view class="center-group flex-col">
<view class="flex-row">
<text class="text_11 text-ellipsis" @click="jump(item)">{{ item.name }}</text>
<view class="right-text-wrapper_1 flex-col">
<view class="right-text-wrapper_1 flex-col" v-show="item.score >= 3">
<text class="text_18">{{ item.score }}</text>
</view>
</view>
@ -60,6 +60,7 @@ export default {
<style lang="scss" scoped>
.list-item {
background-color: #fff;
&:first-of-type {
border-top: solid 2rpx rgb(221, 221, 221);
}

5
components/qn-select/qn-select.vue

@ -11,6 +11,7 @@
<view v-show="isSelected(item.value)" class="icon"></view>
</view>
</slot>
<slot name="operation" v-if="hasOperation"></slot>
</view>
</view>
</view>
@ -62,6 +63,10 @@ export default {
optionsAlign: {
type: String,
default: 'left'
},
hasOperation: {
type: Boolean,
default: false
}
},
data() {

322
manifest.json

@ -1,175 +1,175 @@
{
"name" : "印包客",
"appid" : "__UNI__EBBA73E",
"description" : "",
"versionName" : "1.0.2",
"versionCode" : 101,
"transformPx" : false,
"networkTimeout" : {
"request" : 6000
"name": "印包管家",
"appid": "__UNI__EBBA73E",
"description": "",
"versionName": "1.0.2",
"versionCode": 101,
"transformPx": false,
"networkTimeout": {
"request": 6000
},
/* 5+App */
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
/* 5+App */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"compatible": {
"ignoreVersion": true
},
/* */
"modules": {
"Share": {},
"Payment": {},
"Push": {},
"VideoPlayer": {},
"Geolocation": {}
},
/* */
"distribute": {
/* android */
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters": ["armeabi-v7a", "x86"]
},
/* ios */
"ios": {
"privacyDescription": {
"NSPhotoLibraryUsageDescription": "该应用需要读取你的相册,以便为你编辑信息",
"NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册,以便为你保存信息",
"NSCameraUsageDescription": "该应用需要使用你的摄像头,以便为你编辑信息",
"NSLocationWhenInUseUsageDescription": "该应用需要你的地理位置,以便根据距离为你提供当前位置附近印包厂信息",
"NSLocationAlwaysUsageDescription": "该应用需要你的地理位置,以便根据距离为你提供当前位置附近印包厂信息",
"NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的地理位置,以便根据距离为你提供当前位置附近印包厂信息"
},
"compatible" : {
"ignoreVersion" : true
"idfa": false
},
/* SDK */
"sdkConfigs": {
"maps": {
"amap": {
"appkey_ios": "0182ee2a9fdd5fd3ef6a8bd5a2f98325",
"appkey_android": "877848546f7f3717101a17c33e1d4df3"
}
},
/* */
"modules" : {
"Share" : {},
"Payment" : {},
"Push" : {},
"VideoPlayer" : {},
"Geolocation" : {}
"payment": {
"weixin": {
"__platform__": ["ios", "android"],
"appid": "wx6c66084e2de41575",
"UniversalLinks": "https://apple-app-yyt-printpackage.qniao.cn/"
}
},
/* */
"distribute" : {
/* android */
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters" : [ "armeabi-v7a", "x86" ]
},
/* ios */
"ios" : {
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,以便为你编辑信息",
"NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册,以便为你保存信息",
"NSCameraUsageDescription" : "该应用需要使用你的摄像头,以便为你编辑信息",
"NSLocationWhenInUseUsageDescription" : "该应用需要你的地理位置,以便根据距离为你提供当前位置附近印包厂信息",
"NSLocationAlwaysUsageDescription" : "该应用需要你的地理位置,以便根据距离为你提供当前位置附近印包厂信息",
"NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置,以便根据距离为你提供当前位置附近印包厂信息"
},
"idfa" : false
},
/* SDK */
"sdkConfigs" : {
"maps" : {
"amap" : {
"appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325",
"appkey_android" : "877848546f7f3717101a17c33e1d4df3"
}
},
"payment" : {
"weixin" : {
"__platform__" : [ "ios", "android" ],
"appid" : "wx6c66084e2de41575",
"UniversalLinks" : "https://apple-app-yyt-printpackage.qniao.cn/"
}
},
"ad" : {},
"geolocation" : {
"amap" : {
"__platform__" : [ "ios", "android" ],
"appkey_ios" : "d574088098995ca1210d6b2df09c5dc9",
"appkey_android" : "c8116effd223c3f69a120f86695afc40"
}
},
"share" : {
"weixin" : {
"appid" : "wx6c66084e2de41575",
"UniversalLinks" : "https://apple-app-yyt-printpackage.qniao.cn/"
}
},
"push" : {
"unipush" : {}
}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
},
"splashscreen" : {
"androidStyle" : "default",
"iosStyle" : "common"
}
"ad": {},
"geolocation": {
"amap": {
"__platform__": ["ios", "android"],
"appkey_ios": "d574088098995ca1210d6b2df09c5dc9",
"appkey_android": "c8116effd223c3f69a120f86695afc40"
}
},
"uniStatistics" : {
"enable" : true
"share": {
"weixin": {
"appid": "wx6c66084e2de41575",
"UniversalLinks": "https://apple-app-yyt-printpackage.qniao.cn/"
}
},
"nativePlugins" : {}
},
/* */
"quickapp" : {},
/* */
"mp-weixin" : {
"appid" : "",
"setting" : {
"urlCheck" : false
"push": {
"unipush": {}
}
},
"icons": {
"android": {
"hdpi": "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png"
},
"usingComponents" : true
},
"mp-alipay" : {
"usingComponents" : true
"ios": {
"appstore": "unpackage/res/icons/1024x1024.png",
"ipad": {
"app": "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png"
},
"iphone": {
"app@2x": "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png"
}
}
},
"splashscreen": {
"androidStyle": "default",
"iosStyle": "common"
}
},
"mp-baidu" : {
"usingComponents" : true
"uniStatistics": {
"enable": true
},
"mp-toutiao" : {
"usingComponents" : true
"nativePlugins": {}
},
/* */
"quickapp": {},
/* */
"mp-weixin": {
"appid": "",
"setting": {
"urlCheck": false
},
"uniStatistics" : {
"enable" : false
"usingComponents": true
},
"mp-alipay": {
"usingComponents": true
},
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao": {
"usingComponents": true
},
"uniStatistics": {
"enable": false
},
"vueVersion": "2",
"h5": {
"router": {
"mode": "history"
},
"vueVersion" : "2",
"h5" : {
"router" : {
"mode" : "history"
},
"devServer" : {
"port" : 9090
}
"devServer": {
"port": 9090
}
}
}

2
pages/agreement/index.vue

@ -16,7 +16,7 @@ const content = `软件许可使用协议
在使用印包软件软件名称以实际展示为准以下称许可软件之前请您认真阅读并同意千鸟互联服务协议以及隐私权政策这是我们向您提供许可软件及许可软件相关服务的前提我们特别在此提示您注意阅读免除或者限制责任的条款法律适用和争议解决条款相关条款将以粗体标识您需要重点阅读如您对协议有任何疑问可向客服咨询如果您完全同意并接受本协议您可下载安装或开始使用许可软件
在使用印包管家软件软件名称以实际展示为准以下称许可软件之前请您认真阅读并同意千鸟互联服务协议以及隐私权政策这是我们向您提供许可软件及许可软件相关服务的前提我们特别在此提示您注意阅读免除或者限制责任的条款法律适用和争议解决条款相关条款将以粗体标识您需要重点阅读如您对协议有任何疑问可向客服咨询如果您完全同意并接受本协议您可下载安装或开始使用许可软件

48
pages/digital-workshops/index.vue

@ -5,7 +5,14 @@
<view class="flex-col section_1">
<view class="justify-between section_2">
<view class="select-area">
<qn-select options-align="left" :contentStyle="contentStyle" :options="factoryList" v-model="factoryId" placeholder="请选择工厂"></qn-select>
<qn-select options-align="left" :contentStyle="contentStyle" :options="factoryList" v-model="factoryId" placeholder="请选择工厂" hasOperation>
<template #operation>
<view class="operation" @click.stop="manageFactory">
<text>工厂管理</text>
<image class="icon" src="/static/imgs/digital-workshops/operation-icon.png"></image>
</view>
</template>
</qn-select>
</view>
<text v-show="!isExample" class="text_1" @click="go2('promotion', { id: factoryId, operation: isExample ? 'info' : 'edit' })">推广</text>
</view>
@ -137,17 +144,9 @@ export default {
},
watch: {
factoryId(val, oldVal) {
if (val === -1) {
if (this.companyTip()) {
return
}
go2('factory-manage')
this.factoryId = oldVal
} else {
this.getCameraList()
this.getList()
this.isExample = this.factoryList.find((factory) => factory.value == val).isExample
}
this.getCameraList()
this.getList()
this.isExample = this.factoryList.find((factory) => factory.value == val).isExample
},
refresh(val) {
console.log('refresh', val)
@ -234,6 +233,12 @@ export default {
}
return false
},
manageFactory() {
if (this.companyTip()) {
return
}
go2('factory-manage')
},
addDevice() {
if (this.companyTip()) {
return
@ -262,10 +267,6 @@ export default {
this.getList()
}
this.factoryId = this.factoryList[0].value
this.factoryList.push({
label: '工厂管理',
value: -1
})
})
}
}
@ -279,6 +280,21 @@ export default {
}
.select-area {
max-width: 400rpx;
.operation {
height: 60rpx;
line-height: 60rpx;
color: rgb(0, 0, 0);
font-size: 28rpx;
padding: 0 24rpx;
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1rpx solid #f5f5f5;
.icon {
width: 32rpx;
height: 32rpx;
}
}
}
.group {
flex: 1 1 auto;

1
pages/factory/index.vue

@ -186,6 +186,7 @@ export default {
.content {
width: 750rpx;
height: 100vh;
background-color: rgb(255, 255, 255);
.group_3 {
padding-top: 25rpx;
height: 100%;

2
pages/login/index.vue

@ -30,7 +30,7 @@
<checkbox value="cb" :checked="checked" color="#000000" style="transform: scale(0.7)" />
</checkbox-group>
<view class="agreement">
已阅读并同意印包
已阅读并同意印包管家
<text class="agreement_text" @click="jumpAgreement">用户与隐私协议</text>
</view>
</view>

2
pages/promotion/index.vue

@ -272,7 +272,7 @@ export default {
provider: 'weixin',
type: 0,
title: this.factoryInfo.name,
summary: '印包支持远程验厂,在线了解工厂',
summary: '印包管家支持远程验厂,在线了解工厂',
scene: scene, // WXSceneTimeline,WXSceneSession
imageUrl: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/wx-share-store.png',
href: H5_URL_FACTORY + `shareId=${this.factoryInfo.id}`,

2
pages/setting/index.vue

@ -14,7 +14,7 @@
</view>
<view class="justify-between group_6">
<text class="text_6">当前版本号</text>
<text class="text_7">印包V1.1.0</text>
<text class="text_7">印包管家V1.1.0</text>
</view>
</view>
</view>

BIN
static/imgs/.DS_Store

BIN
static/imgs/digital-workshops/operation-icon.png

Before After
Width: 32  |  Height: 32  |  Size: 948 B

BIN
static/imgs/factory/.DS_Store

BIN
unpackage/res/icons/1024x1024.png

Before After
Width: 1024  |  Height: 1024  |  Size: 294 KiB Width: 1024  |  Height: 1024  |  Size: 182 KiB

BIN
unpackage/res/icons/120x120.png

Before After
Width: 120  |  Height: 120  |  Size: 6.1 KiB Width: 120  |  Height: 120  |  Size: 8.2 KiB

BIN
unpackage/res/icons/144x144.png

Before After
Width: 144  |  Height: 144  |  Size: 7.6 KiB Width: 144  |  Height: 144  |  Size: 10 KiB

BIN
unpackage/res/icons/152x152.png

Before After
Width: 152  |  Height: 152  |  Size: 8.3 KiB Width: 152  |  Height: 152  |  Size: 11 KiB

BIN
unpackage/res/icons/167x167.png

Before After
Width: 167  |  Height: 167  |  Size: 9.6 KiB Width: 167  |  Height: 167  |  Size: 12 KiB

BIN
unpackage/res/icons/180x180.png

Before After
Width: 180  |  Height: 180  |  Size: 11 KiB Width: 180  |  Height: 180  |  Size: 14 KiB

BIN
unpackage/res/icons/192x192.png

Before After
Width: 192  |  Height: 192  |  Size: 11 KiB Width: 192  |  Height: 192  |  Size: 15 KiB

BIN
unpackage/res/icons/20x20.png

Before After
Width: 20  |  Height: 20  |  Size: 729 B Width: 20  |  Height: 20  |  Size: 971 B

BIN
unpackage/res/icons/29x29.png

Before After
Width: 29  |  Height: 29  |  Size: 1.1 KiB Width: 29  |  Height: 29  |  Size: 1.5 KiB

BIN
unpackage/res/icons/40x40.png

Before After
Width: 40  |  Height: 40  |  Size: 1.6 KiB Width: 40  |  Height: 40  |  Size: 2.2 KiB

BIN
unpackage/res/icons/58x58.png

Before After
Width: 58  |  Height: 58  |  Size: 2.5 KiB Width: 58  |  Height: 58  |  Size: 3.5 KiB

BIN
unpackage/res/icons/60x60.png

Before After
Width: 60  |  Height: 60  |  Size: 2.6 KiB Width: 60  |  Height: 60  |  Size: 3.6 KiB

BIN
unpackage/res/icons/72x72.png

Before After
Width: 72  |  Height: 72  |  Size: 3.2 KiB Width: 72  |  Height: 72  |  Size: 4.5 KiB

BIN
unpackage/res/icons/76x76.png

Before After
Width: 76  |  Height: 76  |  Size: 3.5 KiB Width: 76  |  Height: 76  |  Size: 4.9 KiB

BIN
unpackage/res/icons/80x80.png

Before After
Width: 80  |  Height: 80  |  Size: 3.7 KiB Width: 80  |  Height: 80  |  Size: 5.1 KiB

BIN
unpackage/res/icons/87x87.png

Before After
Width: 87  |  Height: 87  |  Size: 4.1 KiB Width: 87  |  Height: 87  |  Size: 5.7 KiB

BIN
unpackage/res/icons/96x96.png

Before After
Width: 96  |  Height: 96  |  Size: 4.6 KiB Width: 96  |  Height: 96  |  Size: 6.2 KiB
Loading…
Cancel
Save