diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue index 33d5da8..da5eeea 100644 --- a/components/bussiness-components/packingStationItem.vue +++ b/components/bussiness-components/packingStationItem.vue @@ -1,228 +1,229 @@ diff --git a/pages.json b/pages.json index 46a2131..4d1d096 100644 --- a/pages.json +++ b/pages.json @@ -1,161 +1,158 @@ { - "pages": [ - { - "path": "pages/client/index", - "style": { - "navigationBarTitleText": "客户", - "navigationStyle": "custom" - } - }, - { - "path": "pages/client-list/index", - "style": { - "navigationBarTitleText": "客户列表", - "navigationStyle": "custom" - } - }, - { - "path": "pages/search/index", - "style": { - "navigationBarTitleText": "客户搜索", - "navigationStyle": "custom" - } - }, - { - "path": "pages/add-user/index", - "style": { - "navigationBarTitleText": "添加客户", - "navigationStyle": "custom" - } - }, - { - "path": "pages/trade/index", - "style": { - "navigationBarTitleText": "交易", - "navigationStyle": "custom" - } - }, - { - "path": "pages/mall/index", - "style": { - "navigationBarTitleText": "商城" - } - }, - { - "path": "pages/mine/index", - "style": { - "navigationBarTitleText": "我的" - } - }, - { - "path": "pages/login/index", - "style": { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, - { - "path": "pages/agreement/index", - "style": { - "navigationBarTitleText": "用户与隐私协议" - } - }, - { - "path": "pages/client-detail/index", - "style": { - "navigationBarTitleText": "客户详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/client-credit/index", - "style": { - "navigationBarTitleText": "客户授信", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/client-signing/index", - "style": { - "navigationBarTitleText": "客户签约", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/client-credit-limit/index", - "style": { - "navigationBarTitleText": "授信额度", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/client-credit-list/index", - "style": { - "navigationBarTitleText": "客户授信列表", - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/my-offer/index", - "style": { - "navigationBarTitleText": "我的报价", - "enablePullDownRefresh": false - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8", - "backgroundColorTop": "#FFFFFF" - }, - "tabBar": { - "color": "#888", - "selectedColor": "#007AFF", - "borderStyle": "white", - "backgroundColor": "#f9f9f9", - "list": [ - { - "pagePath": "pages/client/index", - "iconPath": "static/imgs/tabbar/client-gray.png", - "selectedIconPath": "static/imgs/tabbar/client-blue.png", - "text": "客户" - }, - { - "pagePath": "pages/trade/index", - "iconPath": "static/imgs/tabbar/trade-gray.png", - "selectedIconPath": "static/imgs/tabbar/trade-blue.png", - "text": "交易" - }, - { - "pagePath": "pages/mall/index", - "iconPath": "static/imgs/tabbar/mall-gray.png", - "selectedIconPath": "static/imgs/tabbar/mall-blue.png", - "text": "纸商城" - }, - { - "pagePath": "pages/mine/index", - "iconPath": "static/imgs/tabbar/mine-gray.png", - "selectedIconPath": "static/imgs/tabbar/mine-blue.png", - "text": "我的" - } - ] - }, - "condition": { - //模式配置,仅开发期间生效 - "current": 0, //当前激活的模式(list 的索引项) - "list": [ - { - "name": "", //模式名称 - "path": "", //启动页面,必选 - "query": "" //启动参数,在页面的onLoad函数里面得到 - } - ] - } + "pages": [{ + "path": "pages/client/index", + "style": { + "navigationBarTitleText": "客户", + "navigationStyle": "custom" + } + }, + { + "path": "pages/client-list/index", + "style": { + "navigationBarTitleText": "客户列表", + "navigationStyle": "custom" + } + }, + { + "path": "pages/search/index", + "style": { + "navigationBarTitleText": "客户搜索", + "navigationStyle": "custom" + } + }, + { + "path": "pages/add-user/index", + "style": { + "navigationBarTitleText": "添加客户", + "navigationStyle": "custom" + } + }, + { + "path": "pages/trade/index", + "style": { + "navigationBarTitleText": "交易", + "navigationStyle": "custom" + } + }, + { + "path": "pages/mall/index", + "style": { + "navigationBarTitleText": "商城", + "navigationStyle": "custom" + } + }, + { + "path": "pages/mine/index", + "style": { + "navigationBarTitleText": "我的" + } + }, + { + "path": "pages/login/index", + "style": { + "navigationBarTitleText": "登录", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/agreement/index", + "style": { + "navigationBarTitleText": "用户与隐私协议" + } + }, + { + "path": "pages/client-detail/index", + "style": { + "navigationBarTitleText": "客户详情", + "navigationStyle": "custom" + } + }, + { + "path": "pages/client-credit/index", + "style": { + "navigationBarTitleText": "客户授信", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/client-signing/index", + "style": { + "navigationBarTitleText": "客户签约", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/client-credit-limit/index", + "style": { + "navigationBarTitleText": "授信额度", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/client-credit-list/index", + "style": { + "navigationBarTitleText": "客户授信列表", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/my-offer/index", + "style": { + "navigationBarTitleText": "我的报价", + "enablePullDownRefresh": false + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8", + "backgroundColorTop": "#FFFFFF" + }, + "tabBar": { + "color": "#888", + "selectedColor": "#007AFF", + "borderStyle": "white", + "backgroundColor": "#f9f9f9", + "list": [{ + "pagePath": "pages/client/index", + "iconPath": "static/imgs/tabbar/client-gray.png", + "selectedIconPath": "static/imgs/tabbar/client-blue.png", + "text": "客户" + }, + { + "pagePath": "pages/trade/index", + "iconPath": "static/imgs/tabbar/trade-gray.png", + "selectedIconPath": "static/imgs/tabbar/trade-blue.png", + "text": "交易" + }, + { + "pagePath": "pages/mall/index", + "iconPath": "static/imgs/tabbar/mall-gray.png", + "selectedIconPath": "static/imgs/tabbar/mall-blue.png", + "text": "纸商城" + }, + { + "pagePath": "pages/mine/index", + "iconPath": "static/imgs/tabbar/mine-gray.png", + "selectedIconPath": "static/imgs/tabbar/mine-blue.png", + "text": "我的" + } + ] + }, + "condition": { + //模式配置,仅开发期间生效 + "current": 0, //当前激活的模式(list 的索引项) + "list": [{ + "name": "", //模式名称 + "path": "", //启动页面,必选 + "query": "" //启动参数,在页面的onLoad函数里面得到 + }] + } } diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index d85bbbd..1088020 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -1,22 +1,204 @@ - diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index db9e96e..8159c24 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -79,21 +79,21 @@ - 产房面积: - {{info.plantArea}}m² + 产房面积: + {{info.plantArea}}m² - 年营业额: - {{info.annualTurnover}}万 + 年营业额: + {{info.annualTurnover}}万 - 产房照片: + 产房照片: 点击查看 - 租赁合同: + 租赁合同: 点击查看 @@ -264,10 +264,10 @@ export default { this.seemoreFlag = !this.seemoreFlag }, transformDate(date) { - if (date) { - return `${date[0]}/${date[1]}/${date[2]}` - } - return '' + if (date) { + return date.split('-').join('/') + } + return '' }, previewImg(index, list) { uni.previewImage({ @@ -451,15 +451,29 @@ export default { align-items: center; margin-bottom: 16rpx; } + .title { + flex: 0 0 150rpx; + font-size: 28rpx; + color: #888888; + letter-spacing: 0; + font-weight: 400; + margin-right: 8rpx; + } + .value { + font-size: 28rpx; + color: #333333; + letter-spacing: 0; + font-weight: 400; + } .left { display: flex; flex-direction: row; - justify-content: space-between; + width: 60%; } .right { display: flex; flex-direction: row; - justify-content: space-between; + width: 40%; } } diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue index f36a8bd..e5e9e2b 100644 --- a/pages/client-detail/equipment-information.vue +++ b/pages/client-detail/equipment-information.vue @@ -1,22 +1,247 @@ - diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue index ecb4a44..cd4c837 100644 --- a/pages/client-detail/index.vue +++ b/pages/client-detail/index.vue @@ -7,7 +7,7 @@ - + @@ -78,5 +78,13 @@ export default { line-height: 40rpx; font-weight: 500; } + .segmented { + height: 88rpx; + border-bottom: 2rpx solid #ECECEC; + font-size: 28rpx; + color: #333333; + text-align: center; + font-weight: 400; + } } diff --git a/pages/client-detail/lv-select.vue b/pages/client-detail/lv-select.vue new file mode 100644 index 0000000..5f5bbf0 --- /dev/null +++ b/pages/client-detail/lv-select.vue @@ -0,0 +1,291 @@ + + + \ No newline at end of file diff --git a/pages/client-detail/no-data.vue b/pages/client-detail/no-data.vue new file mode 100644 index 0000000..b700409 --- /dev/null +++ b/pages/client-detail/no-data.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/pages/client-detail/waste-paper-trading.vue b/pages/client-detail/waste-paper-trading.vue index 5b96d08..e9529e9 100644 --- a/pages/client-detail/waste-paper-trading.vue +++ b/pages/client-detail/waste-paper-trading.vue @@ -1,11 +1,13 @@ - diff --git a/static/imgs/client-detail/arrow-right-icon.png b/static/imgs/client-detail/arrow-right-icon.png new file mode 100644 index 0000000..08fce70 Binary files /dev/null and b/static/imgs/client-detail/arrow-right-icon.png differ diff --git a/static/imgs/client-detail/no-data-icon.png b/static/imgs/client-detail/no-data-icon.png new file mode 100644 index 0000000..e13ea10 Binary files /dev/null and b/static/imgs/client-detail/no-data-icon.png differ diff --git a/static/imgs/client-detail/yzjy-icon.png b/static/imgs/client-detail/yzjy-icon.png new file mode 100644 index 0000000..47cf92d Binary files /dev/null and b/static/imgs/client-detail/yzjy-icon.png differ diff --git a/static/imgs/mall/cut-icon.png b/static/imgs/mall/cut-icon.png new file mode 100644 index 0000000..7b943e4 Binary files /dev/null and b/static/imgs/mall/cut-icon.png differ diff --git a/static/imgs/mall/grounding-icon.png b/static/imgs/mall/grounding-icon.png new file mode 100644 index 0000000..6aaa21e Binary files /dev/null and b/static/imgs/mall/grounding-icon.png differ diff --git a/static/imgs/mall/sold-out-icon.png b/static/imgs/mall/sold-out-icon.png new file mode 100644 index 0000000..fbb9b7c Binary files /dev/null and b/static/imgs/mall/sold-out-icon.png differ diff --git a/static/imgs/mall/zsc-bg-icon.png b/static/imgs/mall/zsc-bg-icon.png new file mode 100644 index 0000000..d94e257 Binary files /dev/null and b/static/imgs/mall/zsc-bg-icon.png differ