diff --git a/pages/agent/order/index.wxml b/pages/agent/order/index.wxml
index 70ccae5..fa79a4d 100644
--- a/pages/agent/order/index.wxml
+++ b/pages/agent/order/index.wxml
@@ -54,6 +54,13 @@
货到时间：
{{item.deliveryTime}}
+
+ 货车车牌：
+ 00000001
+ 00000002
+ 00000003
+ 00000004
+
@@ -71,21 +78,21 @@
- function statusColor(status) {
- if (status == 50) {
- return '#F12C20'
- } else if (status == 51) {
- return '#F12C20'
- } else if (status == 52) {
- return '#F12C20'
- } else if (status == 53) {
- return '#008AFF'
- } else if (status == 54) {
- return '#09BB07'
- } else if (status == 55) {
- return '#888888'
- }
- return ''
- }
- module.exports = statusColor
+ function statusColor(status) {
+ if (status == 50) {
+ return '#F12C20'
+ } else if (status == 51) {
+ return '#F12C20'
+ } else if (status == 52) {
+ return '#F12C20'
+ } else if (status == 53) {
+ return '#008AFF'
+ } else if (status == 54) {
+ return '#09BB07'
+ } else if (status == 55) {
+ return '#888888'
+ }
+ return ''
+ }
+ module.exports = statusColor
\ No newline at end of file
diff --git a/pages/bidding/detail/index.wxml b/pages/bidding/detail/index.wxml
index 260e844..583cb96 100644
--- a/pages/bidding/detail/index.wxml
+++ b/pages/bidding/detail/index.wxml
@@ -6,6 +6,9 @@
+
+ 竞价成功！商家已经确认您的竞价，请尽快确认！
+
单号：{{biddingInfo.id}}
{{bidding.orderBidding(biddingInfo.status)}}
@@ -64,17 +67,17 @@
等待下单
- 我的报价：￥{{formate.formatePrice2(recordInfo.biddingUnitPrice, kg)}}
- 剩余时间：{{expiredTime || ''}}
-
-
- 订单编号：{{biddingInfo.orderId}}
-
+ 我的报价：￥{{formate.formatePrice2(recordInfo.biddingUnitPrice, kg)}}
+ 剩余时间：{{expiredTime || ''}}
+
+
+ 订单编号：{{biddingInfo.orderId}}
+
-
- 商品详情
- {{biddingInfo.description}}
-
+
+ 商品详情
+ {{biddingInfo.description}}
+
+
+
-
+
公司名称
{{realName || ''}}
@@ -23,10 +43,10 @@
公司性质
{{identityStr}}
-
+
公司地址
{{companyAddress}}
@@ -35,10 +55,10 @@
昵称
{{userInfo.nickname || '点击修改昵称'}}
-
+
diff --git a/pages/home/info/index.wxss b/pages/home/info/index.wxss
index b0e3abd..e20cbfc 100644
--- a/pages/home/info/index.wxss
+++ b/pages/home/info/index.wxss
@@ -7,4 +7,74 @@
right: 0;
bottom: 0;
z-index: 10;
+}
+
+.wux-badge2 {
+ width: 120rpx;
+ height: 120rpx;
+ position: absolute;
+ z-index: 10;
+ left: 32rpx;
+}
+
+.header-bg {
+ margin-top: 0px;
+ width: 100%;
+ height: 80px;
+ background: linear-gradient(314deg, rgba(50, 107, 250, 1) 0%, rgba(0, 138, 255, 1) 100%);
+ border-bottom-left-radius: 64rpx;
+ border-bottom-right-radius: 64rpx;
+}
+
+.header-box {
+ width: 100%;
+ background: rgba(255, 255, 255, 1);
+ /* box-shadow: 0px 0px 15px -6px rgba(0, 0, 0, 0.32);
+ border-radius: 6px; */
+}
+
+.userinfo-avatar {
+ overflow: hidden;
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 12rpx;
+ border: 2px solid #fff;
+ box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.2);
+}
+
+.account-bg {
+ background: linear-gradient(314deg, rgba(50, 107, 250, 1) 0%, rgba(0, 138, 255, 1) 100%);
+ border-radius: 6px;
+}
+
+.money {
+ font-size: 44rpx;
+ font-family: SFProDisplay-Semibold, SFProDisplay;
+ font-weight: 600;
+ color: rgba(255, 255, 255, 1);
+}
+
+.label {
+ font-size: 24rpx;
+ font-family: PingFang-SC-Regular, PingFang-SC;
+ font-weight: 400;
+ color: rgba(255, 255, 255, 1);
+}
+
+.img-auth {
+ width: 32rpx;
+ height: 32rpx;
+ margin-left: 24rpx;
+ margin-right: 12rpx
+}
+
+.img-auth2 {
+ width: 32rpx;
+ height: 32rpx;
+ margin-right: 12rpx
+}
+
+.realName {
+ max-width: 100px;
+ white-space: nowrap;
}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 15b7d85..d31c6b8 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,76 +1,76 @@
{
- "description": "项目配置文件",
- "packOptions": {
- "ignore": []
- },
- "setting": {
- "urlCheck": false,
- "es6": true,
- "enhance": true,
- "postcss": true,
- "preloadBackgroundData": false,
- "minified": true,
- "newFeature": true,
- "coverView": true,
- "nodeModules": false,
- "autoAudits": false,
- "showShadowRootInWxmlPanel": true,
- "scopeDataCheck": false,
- "uglifyFileName": true,
- "checkInvalidKey": true,
- "checkSiteMap": true,
- "uploadWithSourceMap": true,
- "compileHotReLoad": false,
- "useMultiFrameRuntime": true,
- "useApiHook": true,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
- },
- "enableEngineNative": false,
- "bundle": false,
- "useIsolateContext": true,
- "useCompilerModule": true,
- "userConfirmedUseCompilerModuleSwitch": true,
- "userConfirmedBundleSwitch": false,
- "packNpmManually": false,
- "packNpmRelationList": [],
- "minifyWXSS": true,
- "useApiHostProcess": true
- },
- "compileType": "miniprogram",
- "libVersion": "2.14.4",
- "appid": "wx7a4a8415e6821108",
- "projectname": "zhitongbao-mini",
- "debugOptions": {
- "hidedInDevtools": []
- },
- "isGameTourist": false,
- "simulatorType": "wechat",
- "simulatorPluginLibVersion": {},
- "scripts": {
- "beforeCompile": ""
- },
- "condition": {
- "plugin": {
- "list": []
- },
- "game": {
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
- "miniprogram": {
- "list": [
- {
- "name": "pages/login/index",
- "pathName": "pages/login/index",
- "query": "",
- "scene": 1047
- }
- ]
- }
- }
+ "description": "项目配置文件",
+ "packOptions": {
+ "ignore": []
+ },
+ "setting": {
+ "urlCheck": false,
+ "es6": true,
+ "enhance": true,
+ "postcss": true,
+ "preloadBackgroundData": false,
+ "minified": true,
+ "newFeature": true,
+ "coverView": true,
+ "nodeModules": false,
+ "autoAudits": false,
+ "showShadowRootInWxmlPanel": true,
+ "scopeDataCheck": false,
+ "uglifyFileName": true,
+ "checkInvalidKey": true,
+ "checkSiteMap": true,
+ "uploadWithSourceMap": true,
+ "compileHotReLoad": false,
+ "useMultiFrameRuntime": true,
+ "useApiHook": true,
+ "babelSetting": {
+ "ignore": [],
+ "disablePlugins": [],
+ "outputPath": ""
+ },
+ "enableEngineNative": false,
+ "bundle": false,
+ "useIsolateContext": true,
+ "useCompilerModule": true,
+ "userConfirmedUseCompilerModuleSwitch": true,
+ "userConfirmedBundleSwitch": false,
+ "packNpmManually": false,
+ "packNpmRelationList": [],
+ "minifyWXSS": true,
+ "useApiHostProcess": true
+ },
+ "compileType": "miniprogram",
+ "libVersion": "2.14.4",
+ "appid": "wx7a4a8415e6821108",
+ "projectname": "zhitongbao-mini",
+ "debugOptions": {
+ "hidedInDevtools": []
+ },
+ "isGameTourist": false,
+ "simulatorType": "wechat",
+ "simulatorPluginLibVersion": {},
+ "scripts": {
+ "beforeCompile": ""
+ },
+ "condition": {
+ "plugin": {
+ "list": []
+ },
+ "game": {
+ "list": []
+ },
+ "gamePlugin": {
+ "list": []
+ },
+ "miniprogram": {
+ "list": [
+ {
+ "name": "pages/login/index",
+ "pathName": "pages/login/index",
+ "query": "",
+ "scene": 1047
+ }
+ ]
+ }
+ }
}
\ No newline at end of file