Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

.gitignore

@@ -1,2 +1,3 @@
 unpackage
-.idea
+.idea
+node_modules

README.md

@@ -5,6 +5,10 @@
 <h3 align="center">赛轮全钢项目</h3>
 
 
+## 需安装配置
+axios参考[axios](http://www.axios-js.com/zh-cn/)官网地址
+finally参考[安装命令](npm i promise.prototype.finally -S)官网地址无
+
 
 ## 说明
 扩展了vant的icon字体库

common/p-scan/scan.vue

@@ -17,22 +17,20 @@
 		},
 		created() {
 			var statusBarHeight = uni.getSystemInfoSync().statusBarHeight; //状态栏
-			var height = statusBarHeight + 44 + 104 + 'px';
+			var height = statusBarHeight + 44 + 144 + 'px';
 			var pages = getCurrentPages();
 			var page = pages[pages.length - 1];
 			// #ifdef APP-PLUS
 			var currentWebview = page.$getAppWebview();
 			this.barcode = plus.barcode.create('barcode', this.barcode, {
-				top: '7px',
+				top: '85px',
 				left: '10%',
 				width: '80%',
-				height: '35%', //180px
+				height: '31.5%', //180px
 				position: 'static',
 				background:'#ffffff',
 				frameColor:'#00A0EA',
 				scanbarColor:'#00A0EA'
-				
-				
 			});
 			this.barcode.onmarked = this.onmarked;
 			currentWebview.append(this.barcode);

common/request/request.js

@@ -0,0 +1,53 @@
+//使用方法
+// require("promise.prototype.finally").shim();  //使用时请引用finally
+// import {request} from '../../request/request'
+
+// request({
+//     url: '/room/list',
+// }).then(res => {
+//     console.log(res)
+// }).catch(err => {
+//     console.log(err)
+// }).finally(() => {
+//     Loading.close()
+// })
+
+//配置文件
+import axios from 'axios'
+
+export function request(config) {
+    let newVar = axios.create({
+         baseURL: "http://192.168.237.6:9002",
+        timeout: 10000
+    });
+    return newVar(config);
+}
+
+//在uni-app中使用对app有效果，h5不需要
+axios.defaults.adapter = function (config) {
+    return new Promise((resolve, reject) => {
+        var settle = require('axios/lib/core/settle');
+        var buildURL = require('axios/lib/helpers/buildURL');
+        uni.request({
+            method: config.method.toUpperCase(),
+            url: config.baseURL + buildURL(config.url, config.params, config.paramsSerializer),
+            header: config.headers,
+            data: config.data,
+            dataType: config.dataType,
+            responseType: config.responseType,
+            sslVerify: config.sslVerify,
+            complete: function complete(response) {
+                response = {
+                    data: response.data,
+                    status: response.statusCode,
+                    errMsg: response.errMsg,
+                    header: response.header,
+                    config: config
+                };
+
+                settle(resolve, reject, response);
+            }
+        })
+    })
+}
+

manifest.json

@@ -1,8 +1,8 @@
 {
     "name" : "SAILUN_TBR",
     "appid" : "__UNI__0C3473D",
-    "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.7.7",
+    "description" : "测试",
+    "versionName" : "0.0.0.0.0.1",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {
@@ -90,41 +90,7 @@
                 }
             }
         },
-        "nativePlugins" : {
-            "Mpaas-Scan" : {
-                "License" : "",
-                "WorkspaceId" : "",
-                "AppId" : "_UNI_0C3473D",
-                "__plugin_info__" : {
-                    "name" : "支付宝原生扫码插件",
-                    "description" : "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=2636",
-                    "android_package_name" : "com.sailuntbr.store",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "2636",
-                    "parameters" : {
-                        "License" : {
-                            "des" : "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
-                            "key" : "mpaasConfigLicense",
-                            "value" : ""
-                        },
-                        "WorkspaceId" : {
-                            "des" : "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
-                            "key" : "workspaceId",
-                            "value" : ""
-                        },
-                        "AppId" : {
-                            "des" : "Android平台的AppId，请填写Android的config文件中的appId对应的值",
-                            "key" : "mobilegw.appid",
-                            "value" : ""
-                        }
-                    }
-                }
-            }
-        }
+        "nativePlugins" : {}
     },
     "quickapp" : {},
     "mp-weixin" : {

package-lock.json

@@ -4,6 +4,214 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "axios": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.21.0.tgz?cache=0&sync_timestamp=1603468826655&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.0.tgz",
+      "integrity": "sha1-Jt8IiAOiNQ3/LCf5b++Z/klEKso=",
+      "requires": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.0.tgz?cache=0&sync_timestamp=1604117008862&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.0.tgz",
+      "integrity": "sha1-JBJwVLs/m9y0sfuCQYGGBy93uM4=",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz",
+      "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.7.tgz",
+      "integrity": "sha1-pN5hsvZpifx0IWdsHLl4dXOs5Uw=",
+      "requires": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.0.tgz?cache=0&sync_timestamp=1597057976909&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.0.tgz",
+      "integrity": "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz",
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
+    },
+    "get-intrinsic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/get-intrinsic/download/get-intrinsic-1.0.1.tgz?cache=0&sync_timestamp=1604120592084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fget-intrinsic%2Fdownload%2Fget-intrinsic-1.0.1.tgz",
+      "integrity": "sha1-lKl2j8vdBZWhySc6rPTInQdWMb4=",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz",
+      "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz",
+      "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg="
+    },
+    "is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.2.2.tgz",
+      "integrity": "sha1-x8ZxXNItTdtI0+GZcCI6zquwgNk="
+    },
+    "is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.2.tgz",
+      "integrity": "sha1-vac28s2P0G0yhE53Q7+nSUw7/X4="
+    },
+    "is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
+    },
+    "is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.1.1.tgz?cache=0&sync_timestamp=1596555640141&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.1.1.tgz",
+      "integrity": "sha1-xvmKrMVG9s7FRooHt7FTq1ZKV7k=",
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.3.tgz",
+      "integrity": "sha1-OOEBS55jKb4N6dJKQU/XRB7GGTc=",
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npm.taobao.org/object-inspect/download/object-inspect-1.8.0.tgz?cache=0&sync_timestamp=1592545089271&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.8.0.tgz",
+      "integrity": "sha1-34B+Xs9TpgnMa/6T6sPMe+WzqdA="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz",
+      "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4="
+    },
+    "object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npm.taobao.org/object.assign/download/object.assign-4.1.2.tgz?cache=0&sync_timestamp=1604115183005&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject.assign%2Fdownload%2Fobject.assign-4.1.2.tgz",
+      "integrity": "sha1-DtVKNC7Os3s4/3brgxoOeIy2OUA=",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "promise.prototype.finally": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npm.taobao.org/promise.prototype.finally/download/promise.prototype.finally-3.1.2.tgz",
+      "integrity": "sha1-uK+JFgycZzzv47TEQ1tTz9AocGc=",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.0",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.2.tgz?cache=0&sync_timestamp=1603220012319&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimend%2Fdownload%2Fstring.prototype.trimend-1.0.2.tgz",
+      "integrity": "sha1-bd2ah5a8cUtImjriIkaiCPN7+kY=",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha1-bjoKS9pxflAjqzuOkL7DYQjSLGg=",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.2.tgz?cache=0&sync_timestamp=1603220012476&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.2.tgz",
+      "integrity": "sha1-ItRdqBAVMJzQzdeXh+iRn8XGE+c=",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha1-bjoKS9pxflAjqzuOkL7DYQjSLGg=",
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
+      }
+    },
     "vue-i18n": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",

package.json

@@ -18,6 +18,8 @@
   },
   "homepage": "https://github.com/YanxinNet/uView#readme",
   "dependencies": {
+    "axios": "^0.21.0",
+    "promise.prototype.finally": "^3.1.2",
     "vue-i18n": "^8.20.0"
   }
 }

pages.json

@@ -60,10 +60,8 @@
 					"navigationBarBackgroundColor": "#0095FF",
 					"navigationBarTextStyle": "white",
 					"app-plus": {
-						"bounce": "none", //关闭窗口回弹效果
-						"scrollIndicator": "none"
+						"titleNView": false
 					}
-					// "app-plus": {"titleNView": false} //取消去掉导航栏顶部标题
 				}
 
 			},
@@ -75,6 +73,7 @@
 				}
 
 			},
+			
 			// 扫码出库确认
 			{
 				"path": "Scan-code-out/index",
@@ -95,6 +94,11 @@
 					"navigationBarTitleText": "积分商城"
 				}
 			}, {
+				"path": "shopping/integral_mall_confirmorder",
+				"style": {
+					"navigationBarTitleText": "订单确认"
+				}
+			}, {
 				"path": "shopping/inline_shop",
 				"style": {
 					"navigationStyle": "custom", // 隐藏系统导航栏
@@ -109,7 +113,8 @@
 			,{
 			    "path" : "my-stock/my-stock",
 			    "style" : {
-					"navigationBarTitleText": "我的库存"
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"navigationBarTextStyle": "white"
 				}
 			}
 		]
@@ -141,6 +146,14 @@
 					"navigationBarBackgroundColor": "#1692F7"
 				}
 			},
+			// 搜索页面
+			{
+				"path": "search/index",
+				"style": {
+					"navigationBarTitleText": "搜索"
+				}
+			
+			},
 			//优惠卷
 			{
 				"path": "coupon",
@@ -175,20 +188,14 @@
 			{
 				"path": "scancodequery/scan",
 				"style": {
-					"navigationBarTitleText": "胎号查询",
-					"app-plus": {
-						"bounce": "none" //取消页面上的回弹效果
-					}
+					"navigationBarTitleText": "胎号查询"
 				}
 			},
 			//查询结果
 			{
 				"path": "scancodequery/result",
 				"style": {
-					"navigationBarTitleText": "查询结果",
-					"app-plus": {
-						"bounce": "none" //取消页面上的回弹效果
-					}
+					"navigationBarTitleText": "查询结果"
 				}
 			},
 			//入库明细
@@ -285,7 +292,8 @@
 		"navigationBarBackgroundColor": "#0095FF",
 		"navigationBarTextStyle": "white",
 		"app-plus": {
-			"bounce": "none" //关闭窗口回弹效果
+			"bounce": "none" ,//关闭窗口回弹效果
+			"scrollIndicator": "none"//app页面不显示滚动条
 		}
 	},
 	"tabBar": {

pages/home/Scan-code-in/index.vue

@@ -9,7 +9,7 @@
 				<view>物料</view>
 				<view>预计奖励</view>
 			</view>
-			<view v-for="(item,index) in datalist">
+			<view v-for="(item,index) in datalist" :key="index">
 				<view class="content-two">
 					<view>{{item.title}}</view>
 					<view>{{item.type}}</view>

pages/home/Scan-code-out/index.vue

@@ -8,7 +8,7 @@
 				<view>胎号</view>
 				<view>物料</view>
 			</view>
-			<view v-for="(item,index) in datalist">
+			<view v-for="(item,index) in datalist" :key="index">
 			<view class="content-two">
 				<view>{{item.order}}</view>
 				<view>{{item.size}}</view>

pages/home/my-stock/my-stock.vue

@@ -1,6 +1,26 @@
 <template>
-	<view>
+	<view >
 		<!-- 我的库存 -->
+		<view class="content-top">
+			<u-navbar :background="background" back-icon-color="#ffffff" is-fixed>
+				<u-search placeholder="请输入轮胎规格" :show-action="false" v-model="keyword" style="margin-right: 26rpx;" @change="handleSearch"></u-search>
+			</u-navbar>
+			<u-tabs ref="tabs" :list="list" bg-color="#0094FE" active-color="#ffffff" inactive-color="#ffffff" font-size="30" :current="current" @change="handleFilterBrand"></u-tabs>
+		</view>
+		<view class="content-center">
+			<view class="list-row u-flex list-title">
+				<view class="list-left">轮胎规格</view>
+				<view class="list-right">库存</view>
+			</view>
+			<view class="list-row u-flex">
+				<view class="list-left">赛轮 12R22.5 152/149K 18PR S838</view>
+				<view class="list-right">160</view>
+			</view>
+			<view class="list-row u-flex">
+				<view class="list-left">赛轮 12R22.5 152/149K 18PR S838</view>
+				<view class="list-right">160</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +28,68 @@
 	export default {
 		data() {
 			return {
-				
+				background: {
+					backgroundColor: "#0291FD",
+				},
+				keyword: "",
+				current: 0,
+				list: [{
+					name: "全部"
+				},{
+					name: "黑骑士"
+				},{
+					name: "路极"
+				},{
+					name: "黑盾"
+				},{
+					name: "赛轮"
+				}]
 			}
 		},
 		methods: {
-			
+			handleSearch: function(v){
+				console.log(v)
+			},
+			handleFilterBrand: function(v2){
+				this.current = v2
+				console.log(arguments);
+				console.log(v2)
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+	.content-top{
+		background-color: #0094FE;
+		padding-bottom: 119rpx;
+	}
+	.content-center{
+		width: 712rpx;
+		margin: -106rpx auto 0 auto;
+		border-radius: 20rpx;
+		background-color: #FFFFFF;
+		height: 335rpx;
+		padding: 26rpx;
+		.list-row{
+			justify-content: space-between;
+			border-bottom: 1px solid #E8E8E8;
+			padding: 32rpx 0;
+			.list-right{
+				color: #149EE2;
+				text-decoration: underline;
+			}
+		}
+		.list-row.list-title{
+			padding-top: 0;
+			font-weight: 600;
+			.list-right{
+				color: #4D4D4D;
+				font-weight: 400;
+				text-decoration: none;
+			}
+		}
+		
+	}
+	
 </style>

pages/home/scancode/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+		<u-navbar :title="nbTitle" back-icon-color="#ffffff" title-color="#ffffff" :background="background" :border-bottom="false"></u-navbar>
 		<view class="text-area">
 			<view class="white_b"></view>
 		</view>
@@ -18,8 +19,8 @@
 					<image src="../../../static/sailun/line.png" style="width: 100%;height: 1rpx;" mode=""></image>
 				</view>
 			</view>
-			<view class="generate" style="overflow:auto;">
-				<u-table font-size="20" border-color="#ffffff" bg-color="#fff">
+			<view class="generate">
+				<u-table font-size="24" border-color="#ffffff" bg-color="#fff">
 					<u-tr class="u-tr">
 						<u-th class="u-th" width="30%">胎号</u-th>
 						<u-th class="u-th">规格</u-th>
@@ -51,20 +52,22 @@
 			return {
 				tips: '提示',
 				number: '请扫码入库',
+				nbTitle: '扫码标题',
 				i: 1,
 				lisi: [{
-					name: '1',
+					name: '123456789154Sad',
 					Specifications: '175/70R14 88T XL BH15 BGBL'
-				}]
+				}],
+				background: {
+					backgroundColor: '#0094fe',
+				}
 			}
 		},
 		onLoad() {
 
 		},
 		onReady() {
-			uni.setNavigationBarTitle({
-				title: '扫码干哈'
-			});
+
 		},
 		methods: {
 			bug() {
@@ -82,19 +85,20 @@
 				this.tips = "胎号"
 				this.bug()
 			},
-			scancodein(){
+			scancodein() {
 				this.$u.route({
-					url: 'pages/home/Scan-code-in/index',
+					url: 'pages/home/Scan-code-in/index'
 				})
 			}
 		}
 	}
 </script>
 
-<style>
+<style scoped>
 	.generate {
-		width: 92%;
+		width: 98%;
 		height: 420rpx;
+		overflow:auto;
 		margin: 0 auto;
 		margin-top: 120rpx;
 	}
@@ -123,15 +127,15 @@
 	.stripe {
 		width: 720rpx;
 		height: 30rpx;
-		background: rgba(0, 0, 0, 0.2);
+		background-color: rgba(0, 0, 0, 0.2);
 		border-radius: 12rpx;
 		margin: 0 auto;
-		margin-top: -200rpx;
+		margin-top: -100rpx;
 	}
 
 	.text-area {
 		width: 100%;
-		height: 750rpx;
+		height: 650rpx;
 		background-color: #0094fe;
 		display: flex;
 		justify-content: center;
@@ -140,7 +144,7 @@
 	.white_b {
 		width: 83%;
 		height: 540rpx;
-		background-color: rgb(255, 255, 255, 0.5);
+		background-color: rgba(255, 255, 255, 0.5);
 		border-radius: 20rpx;
 	}
 
@@ -197,4 +201,10 @@
 		float: left;
 		margin-left: -30rpx;
 	}
+
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background-color: #0095FF;
+	}
 </style>

pages/home/shopping/integral_mall.vue

@@ -25,13 +25,14 @@
 							<view class="price">
 								{{ item.price }}积分
 							</view>
-							<view class="exchange">立即兑换</view>
+							<view class="exchange">加入购物车</view>
 						</view>
 					</view>
 				</view>
 			</view>
 			<u-loadmore :status="loadStatus" bgColor="#f2f2f2"></u-loadmore>
 		</view>
+		<view id="shopping-car"><u-icon :custom-style="iconCustomStyleCarFixed" size="48" name="car" color="#9999999"></u-icon><u-badge :offset="[-8,-8]" :count="goodsCounts" type="error"></u-badge></view>
 		<u-popup v-model="showFilterPopup" mode="right" width="60%">
 			<view class="filter-title">分类</view>
 			<block v-for="(item,index) in tabbar" :key="index">
@@ -71,6 +72,13 @@
 				}],
 				keyword: "",
 				inputCustomStyle: {},
+				iconCustomStyleCarFixed: {
+					background: "#ffffff",
+					padding: "16rpx",
+					borderRadius: "50%",
+					boxShadow: "0px 1px 12px 0px rgba(116, 116, 116, 0.6)"
+				},
+				goodsCounts: 100,
 				showFilterPopup: false,
 				tabbar: [{
 					"name": "品牌",
@@ -370,4 +378,10 @@
 			}
 		}
 	}
+	#shopping-car{
+		position: fixed;
+		z-index: 9999;
+		right: 26rpx;
+		bottom: 300rpx;
+	}
 </style>

pages/home/shopping/integral_mall_confirmorder.vue

@@ -0,0 +1,384 @@
+<template>
+	<view>
+		<!-- 确认订单 -->
+		<view class="content-top">
+			<view class="addressInfo" >
+				<view class="top">
+					<view class="name">{{ addressInfo.name }}</view>
+					<view class="phone">{{ addressInfo.phone }}</view>
+				<!-- 	<view class="tag">
+						<text v-for="(item, index) in addressInfo.tag" :key="index" :class="{red:item.tagText=='默认'}">{{ item.tagText }}</text>
+					</view> -->
+				</view>
+				<view class="bottom">
+					{{addressInfo.site}}
+					<u-icon name="edit-pen" :size="40" color="#999999" @click="handleSelecAddress"></u-icon>
+				</view>
+			</view>
+		</view>
+		<view class="content-center">
+			<view class="order">
+				<view class="item" v-for="(item, index) in list" :key="index">
+					<view class="left"><image :src="item.image" mode="aspectFill"></image></view>
+					<view class="content">
+						<view class="title u-line-2">{{ item.title }}</view>
+						<view class="type">{{ item.type }}</view>
+						<!-- <view class="delivery-time">发货时间 {{ item.deliveryTime }}</view> -->
+						<view class="price-row">
+							<view class="count-text">
+								数量
+							</view>
+							<view class="count">
+								×{{ item.count }}
+							</view>
+						</view>
+						<view class="price">
+							{{ item.price }}积分
+						</view>
+						
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="navigation">
+			<view class="left">
+				<view class="item">
+					<view class="total">合计：<text style="color: #ff7900;">2条</text></view>
+				</view>
+			</view>
+			<view class="right">
+				<view class="buy btn u-line-1" @click="handleSubmit">立即兑换</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				addressInfo: {
+					id: 1,
+					name: '游学中华',
+					phone: '18323455233',
+					tag: [
+						{
+							tagText: '默认'
+						},
+						{
+							tagText: '家'
+						}
+					],
+					site: '广东省深圳市宝安区 自由路66号'
+				},
+				list: [{
+						price: 35,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+					},
+					{
+						price: 75,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t1/47645/22/6120/140457/5d3d17deEec9f8e8d/3687ff03ca89b48c.jpg',
+					},
+					{
+						price: 385,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img11.360buyimg.com/n7/jfs/t1/88990/24/4208/105799/5de4c6e9E24bc09d0/f810effb14c9c13a.jpg',
+					},
+					{
+						price: 784,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t1/93698/23/4500/114562/5de713dfEfc997085/e8deaa979909851d.jpg',
+					},
+					{
+						price: 7891,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img11.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+					},
+					{
+						price: 2341,
+						count: '100',
+						title: '175/70R14 88T XL SH08 BGSL',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 661,
+						count: '100',
+						title: '175/70R14 88T XL SH08 BGSL',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 1654,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 1678,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 924,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+					{
+						price: 8243,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+					},
+				]
+			}
+		},
+		methods: {
+			handleSubmit: function(){
+				
+			},
+			handleSelecAddress: function(){
+				uni.navigateTo({
+					url: "/pages/me/address"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-top{
+		background-color: #0094FE;
+		padding-bottom: 119rpx;
+		.addressInfo {
+			padding: 40rpx 20rpx;
+			background-color: #FFFFFF;
+			width: 712rpx;
+			margin: 0 auto;
+			border-radius: 20rpx;
+			.top {
+				display: flex;
+				font-weight: bold;
+				font-size: 34rpx;
+				.phone {
+					margin-left: 60rpx;
+				}
+				.tag {
+					display: flex;
+					font-weight: normal;
+					align-items: center;
+					text {
+						display: block;
+						width: 60rpx;
+						height: 34rpx;
+						line-height: 34rpx;
+						color: #ffffff;
+						font-size: 20rpx;
+						border-radius: 6rpx;
+						text-align: center;
+						margin-left: 30rpx;
+						background-color:rgb(49, 145, 253);
+					}
+					.red{
+						background-color:red
+					}
+				}
+			}
+			.bottom {
+				display: flex;
+				margin-top: 20rpx;
+				font-size: 28rpx;
+				justify-content: space-between;
+				color: #999999;
+			}
+		}
+	}
+	.content-center{
+		width: 712rpx;
+		margin: -106rpx auto 0 auto;
+		border-radius: 20rpx;
+		background-color: #FFFFFF;
+		padding: 26rpx;
+		.order {
+			background-color: #ffffff;
+			// margin: 20rpx auto;
+			border-radius: 20rpx;
+			box-sizing: border-box;
+			padding: 20rpx;
+			font-size: 28rpx;
+			.top {
+				display: flex;
+				justify-content: space-between;
+				.left {
+					display: flex;
+					align-items: center;
+					.store {
+						margin: 0 10rpx;
+						font-size: 32rpx;
+						font-weight: bold;
+					}
+				}
+				.right {
+					color: $u-type-warning-dark;
+				}
+			}
+			.item {
+				display: flex;
+				margin: 20rpx 0 0;
+				.left {
+					margin-right: 20rpx;
+					image {
+						width: 200rpx;
+						height: 200rpx;
+						border-radius: 10rpx;
+					}
+				}
+				.content {
+					.title {
+						font-size: 28rpx;
+						line-height: 50rpx;
+					}
+					.type {
+						margin: 10rpx 0;
+						font-size: 24rpx;
+						color: $u-tips-color;
+					}
+					.delivery-time {
+						color: #e5d001;
+						font-size: 24rpx;
+					}
+					.price-row{
+						display: flex;
+						justify-content: space-between;
+						margin: 10rpx 0;
+						font-size: 26rpx;
+						.price{
+							color: #FF0000;
+						}
+						.exchange{
+							background: #0094FE;
+							color: #FFFFFF;
+							padding: 4rpx 16rpx;
+							line-height: 1.5;
+						},
+						.count-text{
+							color: #999999;
+							font-size: 18rpx;
+						}
+						.count{
+							color: #999999;
+							font-size: 18rpx;
+						}
+					}
+				}
+				.right {
+					margin-left: 10rpx;
+					padding-top: 20rpx;
+					text-align: right;
+					.decimal {
+						font-size: 24rpx;
+						margin-top: 4rpx;
+					}
+					.number {
+						color: $u-tips-color;
+						font-size: 24rpx;
+					}
+				}
+			}
+			.total {
+				margin-top: 20rpx;
+				text-align: right;
+				font-size: 24rpx;
+				.total-price {
+					font-size: 32rpx;
+				}
+			}
+			.bottom {
+				display: flex;
+				margin-top: 40rpx;
+				padding: 0 10rpx;
+				justify-content: space-between;
+				align-items: center;
+				.btn {
+					line-height: 52rpx;
+					width: 160rpx;
+					border-radius: 26rpx;
+					border: 2rpx solid $u-border-color;
+					font-size: 26rpx;
+					text-align: center;
+					color: $u-type-info-dark;
+				}
+				.evaluate {
+					color: $u-type-warning-dark;
+					border-color: $u-type-warning-dark;
+				}
+			}
+		}
+	}
+.navigation {
+		display: flex;
+		width: 100%;
+		justify-content: space-between;
+		margin-top: 100rpx;
+		border: solid 2rpx #f2f2f2;
+		background-color: #ffffff;
+		padding: 16rpx 0;
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		.left {
+			display: flex;
+			// font-size: 20rpx;
+
+			.item {
+				margin: 0 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				.total{
+					font: 34rpx;
+				}	
+				&.car {
+					text-align: center;
+					position: relative;
+
+					.car-num {
+						position: absolute;
+						top: -10rpx;
+						right: -10rpx;
+					}
+				}
+			}
+		}
+
+		.right {
+			display: flex;
+			font-size: 28rpx;
+			align-items: center;
+
+			.btn {
+				line-height: 66rpx;
+				padding: 0 30rpx;
+				border-radius: 36rpx;
+				color: #ffffff;
+			}
+
+			.cart {
+				background-color: #ed3f14;
+				margin-right: 30rpx;
+			}
+
+			.buy {
+				margin: 0 16rpx;
+				background-color: #ff7900;
+			}
+		}
+	}
+</style>

pages/me/Delivery-details/index.vue

@@ -10,7 +10,7 @@
 				<u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar>
 				<u-search :show-action="true" :animation="true"></u-search>
 			</view>
-			<view class="content-one" v-for="(item,index) in datalist">
+			<view class="content-one" v-for="(item,index) in datalist" :key="index">
 				<view class="content-one-view">
 				</view>
 				<view class="content-one-text">单号：20200609135904795 - 20753</view>
@@ -143,7 +143,7 @@
 		position: relative;
 		top: -40rpx;
 		left: 530rpx;
-		font-size: 13rpx;
+		font-size: 16rpx;
 		color: #626262;
 	}
 	.content-two {

pages/me/Reward-details/index.vue

@@ -8,9 +8,11 @@
 				<u-tabs style="width: 500rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
 				<u-select style=" color: #fff;" v-model="showBrand" :list="brandList"></u-select>
 				<u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar>
-				<u-search :show-action="true" :animation="true"></u-search>
+				<view @click="search">
+					<u-search :show-action="true" :animation="true"></u-search>
+				</view>
 			</view>
-			<view class="content-one" v-for="(item,index) in datalist">
+			<view class="content-one" v-for="(item,index) in datalist" :key="index">
 				<view class="content-one-view">
 				</view>
 				<view class="content-one-text">获得奖励：2元</view>
@@ -98,6 +100,11 @@
 				};
 			},
 			methods: {
+				search(){
+					this.$u.route({
+						url: 'pages/me/search/index',
+					})
+				},
 				change(index) {	
 					this.current = index;
 					if(this.current==1){

pages/me/Statistical-task/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="top">
 		<view class="qiun-charts">
-			<view v-for="(item,index) in datalist">
+			<view v-for="(item,index) in datalist" :key="index">
 				<view class="content">
 					<view class="qiun-charts-one">
 					</view>

pages/me/Warehousing-details/index.vue

@@ -2,20 +2,21 @@
 	<!-- 入库明细页面 -->
 	<view class="header">
 		<view class="header-one">
-			库存总量：<text>999</text>
+			库存总量：<text>9999</text>
 		</view>
 			<view class="content">
-				<u-tabs style="width: 500rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+				<u-tabs style="width: 750rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
 				<u-select style=" color: #fff;" v-model="showBrand" :list="brandList"></u-select>
 				<u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar>
-				<u-search :show-action="true" :animation="true"></u-search>
+				<view @click="search"><u-search :show-action="true" :animation="true"></u-search></view>
+				
 			</view>
-			<view class="content-one" v-for="(item,index) in datalist">
+			<view class="content-one" v-for="(item,index) in datalist" :key="index">
 				<view class="content-one-view">
 				</view>
 				<view class="content-one-text">单号：20200609135904795 - 20753</view>
 				<view class="content-one-time">2020-10-28</view>
-				<u-collapse class="content-two" body-style="color:red;">
+				<u-collapse class="content-two">
 						<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">
 							<view class="content-two1">
 								物料描述：{{item.body}}
@@ -79,6 +80,11 @@
 				};
 			},
 			methods: {
+				search(){
+					this.$u.route({
+						url: 'pages/me/search/index',
+					})
+				},
 				change(index) {	
 					this.current = index;
 					if(this.current==1){
@@ -135,7 +141,7 @@
 		position: relative;
 		top: -8rpx;
 		left: 60rpx;
-		font-size: 24rpx;
+		font-size: 28rpx;
 		font-weight: bold;
 		color: #000;
 	}
@@ -143,7 +149,7 @@
 		position: relative;
 		top: -40rpx;
 		left: 530rpx;
-		font-size: 13rpx;
+		font-size: 16rpx;
 		color: #626262;
 	}
 	.content-two {

pages/me/agent-stock/agent-stock.vue

@@ -1,22 +1,210 @@
 <template>
-	<view>
-		<!-- 经销商库存 -->
+	<!-- 经销商库存页面 -->
+	<view class="header">
+		<view class="header-one">
+			库存是否充足：<text>充足</text>
+		</view>
+			<view class="content">
+				<u-tabs style="width: 500rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+				<u-select style=" color: #fff;" v-model="showBrand" :list="brandList"></u-select>
+				<u-select style=" color: #fff;" v-model="showmateriel" :list="materielList"></u-select>
+				<!-- <u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar> -->
+				<u-search :show-action="true" :animation="true"></u-search>
+			</view>
+			<view class="content-one">
+				<view class="content-two" v-for="(item,index) in datalist" :key="index">
+					<view>
+						{{ item.name }}
+					</view>
+					<view>
+						{{ item.number}}
+					</view>
+					<view>
+						{{ item.state }}
+					</view>
+				</view>
+			</view>
+			
+			
 	</view>
 </template>
 
 <script>
 	export default {
-		data() {
-			return {
-				
+			data() {
+				return {
+					datalist: [
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '紧张'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+					],
+					list: [{
+						name: '全部'
+					}, {
+						name: '品牌'
+					}, {
+						name: '物料',
+					}],
+					itemList: [{
+										head: "赛轮 12R22.5 18PR S838",
+										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
+										open: true,
+										disabled: true
+									},{
+										head: "赛轮 12R22.5 18PR S838",
+										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
+										open: false,
+									},{
+										head: "赛轮 12R22.5 18PR S838",
+										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
+										open: false,
+									}],
+					brandList: [{
+							value: '1',
+							label: '赛轮'
+						},
+						{
+							value: '2',
+							label: '黑鹰'
+						}
+					],
+					materielList: [{
+							value: '1',
+							label: '物料1'
+						},
+						{
+							value: '2',
+							label: '物料2'
+						}
+					],
+					current: 0,
+					showBrand: false,
+					showmateriel: false,
+					showDate: false,
+					mode: 'date'
+				};
+			},
+			methods: {
+				change(index) {	
+					this.current = index;
+					if(this.current==1){
+						this.showBrand=true
+					}else if(this.current==2){
+						this.showmateriel=true
+					}
+				}
 			}
-		},
-		methods: {
-			
-		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.header {
+		height: 400rpx;
+		width: 100%;
+		background: #0094FE;
+		color: #fff;
+		font-size: 28rpx;
+	}
 
+	.header-one {
+		text-align: center;
+		padding-top: 40rpx;
+	}
+
+	.header-one>text {
+		font-size: 52rpx;
+	}
+	.content {
+		display: flex;
+		justify-content: space-between;
+		width: 700rpx;
+		margin-top: 80rpx;
+	}
+	.content-one {
+		width: 690rpx;
+		// height: 305rpx;
+		background: #FFFFFF;
+		color: #000;
+		font-size: 24rpx;
+		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
+		border-radius: 20px;
+		margin: 0 auto;
+		margin-top: 50rpx;
+	}
+	.content-one-view {
+		width: 6rpx;
+		height: 30rpx;
+		background: #0292FD;
+		position: relative;
+		top: 20rpx;
+		left: 30rpx;
+	}
+	.content-one-text {
+		position: relative;
+		top: -8rpx;
+		left: 60rpx;
+		font-size: 24rpx;
+		font-weight: bold;
+		color: #000;
+	}
+	.content-one-time {
+		position: relative;
+		top: -40rpx;
+		left: 530rpx;
+		font-size: 13rpx;
+		color: #626262;
+	}
+	
+	.content-two {
+		display: flex;
+        justify-content: space-between;
+		font-size: 24rpx;
+		color: #6A6A6A;
+		margin-left: 30rpx;
+		margin-right: 30rpx;
+		padding-top: 25rpx;
+		padding-bottom: 25rpx;
+	}
+	
 </style>

pages/me/index.vue

@@ -148,7 +148,7 @@
 								</view>
 							</view>
 							
-							<view class="u-flex u-row-centter" style="flex-direction: column;width: 25%;">
+							<view class="u-flex u-row-centter" style="flex-direction: column;width: 25%;" @click="inorder">
 								<view>
 									<u-image width="80rpx" height="80rpx" src="../../static/sailun/me-order.png" :lazy-load="true" shape="circle">
 									</u-image>
@@ -254,6 +254,11 @@
 					url: 'pages/me/scancodequery/scan',
 				})
 			},
+			inorder(){
+				this.$u.route({
+					url: 'pages/me/my-order/my-order',
+				})
+			},
 			inCoupon(){
 				this.$u.route({
 					url: 'pages/me/coupon',

pages/me/my-order/my-order.vue

@@ -1,6 +1,146 @@
+<!-- 我的订单 -->
 <template>
 	<view>
-		<!-- 我的订单 -->
+		<view class="top">
+			<view class="head">
+				<view></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view>{{state}}</view>
+					<view class="triangle"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #FC1E1E;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #FC1E1E;">{{state}}</view>
+					<view class="triangle1"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #0094FE;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #0094FE;">{{state}}</view>
+					<view class="triangle2"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #14EBBB;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #14EBBB;">{{state}}</view>
+					<view class="triangle3"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #14EBBB;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #14EBBB;">{{state}}</view>
+					<view class="triangle3"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +148,106 @@
 	export default {
 		data() {
 			return {
-				
+				number: '137678199412137865',
+				state: '状态是'
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.top {
+		width: 702rpx;
+		margin: 0 auto;
+		padding-top: 20rpx;
+		background-color: #FFFFFF;
+		margin-top: 20rpx;
+		border-radius: 10rpx;
+		box-shadow: 0px 6px 24px 0px rgba(0, 0, 0, 0.1);
+		padding-bottom: 20rpx;
+	}
+
+	.content {
+		width: 642rpx;
+		background-color: #fff;
+		margin: 0 auto;
+		margin-top: 80rpx;
+		border-top: 1rpx solid #E7E8EA;
+		padding-top: 20rpx;
+	}
+	.content>view{
+		margin-bottom: 10rpx;
+	}
+	.content>view>text{
+		color: #303134;
+		font-size: 28rpx;
+	}
+	.content>view>text:nth-child(2) {
+		float: right;
+	}
+
+	.head {
+		width: 702rpx;
+	}
+
+	.head>view:nth-child(1) {
+		width: 16rpx;
+		height: 60rpx;
+		background: #F6CF19;
+		float: left;
+	}
+
+	.head>view:nth-child(2) {
+		width: 500rpx;
+		height: 60rpx;
+		font-size: 30rpx;
+		float: left;
+		line-height: 60rpx;
+		overflow: hidden;
+		font-weight: bold;
+		margin-left: 10rpx;
+	}
+
+	.head>view:nth-child(3) {
+		width: 190rpx;
+		float: right;
+		margin-right: -20rpx;
+	}
+
+	.head>view:nth-child(3)>view:nth-child(1) {
+		width: 190rpx;
+		height: 60rpx;
+		background: #F6CF19;
+		border-radius: 500rpx 0px 0px 500rpx;
+		float: right;
+		text-align: center;
+		color: #FFFFFF;
+		line-height: 60rpx;
+		overflow: hidden;
+	}
 
+	.triangle,.triangle1,.triangle2,.triangle3 {
+		width: 0px;
+		height: 0px;
+		margin-top: 60rpx;
+		margin-right: -190rpx;
+		border: 10rpx solid;
+		transform: rotate(270deg);
+		float: right;
+	}
+	.triangle{
+		border-color: #B89804 #B89804 transparent transparent;
+	}
+	.triangle1 {
+		border-color: #960000 #960000 transparent transparent;
+	}
+	.triangle2 {
+		border-color: #0F519C #0F519C transparent transparent;
+	}
+	.triangle3 {
+		border-color: #01A07D #01A07D transparent transparent;
+	}
 </style>

pages/me/search/index.vue

@@ -0,0 +1,107 @@
+<template>
+	<view>
+		<view class="content">
+			<u-search placeholder="请输入搜索内容" @click="data" v-model="keyword"></u-search>
+		</view>
+		
+		<view class="content-one" v-for="(item,index) in datalist" :key="index">
+			<view class="content-one-view">
+			</view>
+			<view class="content-one-text">单号：20200609135904795 - 20753</view>
+			<view class="content-one-time">2020-10-28</view>
+			<view class="content-two">
+				<view>
+					赛轮
+				</view>
+				<view>
+					aaaaaaaaaaabbbbbbbbb
+				</view>
+			</view>
+			<view class="content-two">
+				<view>
+					赛轮
+				</view>
+				<view>
+					aaaaaaaaaaabbbbbbbbb
+				</view>
+			</view>
+			<view class="content-two">
+				<view>
+					赛轮
+				</view>
+				<view>
+					aaaaaaaaaaabbbbbbbbb
+				</view>
+			</view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				datalist: [
+					{},
+					{}
+				],
+				keyword: ''
+			}
+		},
+		methods: {
+			data() {
+				console.log("@@@")
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		margin-top: 30rpx;
+	}
+	.content-one {
+		width: 690rpx;
+		// height: 338rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
+		border-radius: 20px;
+		margin: 0 auto;
+		margin-top: 50rpx;
+	}
+	.content-one-view {
+		width: 6rpx;
+		height: 30rpx;
+		background: #0292FD;
+		position: relative;
+		top: 20rpx;
+		left: 30rpx;
+	}
+	.content-one-text {
+		position: relative;
+		top: -8rpx;
+		left: 60rpx;
+		font-size: 24rpx;
+		font-weight: bold;
+		color: #000;
+	}
+	.content-one-time {
+		position: relative;
+		top: -40rpx;
+		left: 530rpx;
+		font-size: 16rpx;
+		color: #626262;
+	}
+	.content-two {
+		display: flex;
+		justify-content: space-between;
+		width: 600rpx;
+		margin: 0 auto;
+	}
+	
+	.content-two>view:nth-child(2) {
+		margin-bottom: 30rpx;
+		
+	}
+</style>

pages/msg/Order-details/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 订单详情页面 -->
 	<view>
-		<view class="content" v-for="(item,index) in datalist">
+		<view class="content" v-for="(item,index) in datalist" :key="index">
 			<view class="content-one">
 				{{ item.order }}
 			</view>

pages/msg/System-message/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 系统消息页面 -->
 	<view class="header">
-		<view class="content" v-for="(item,index) in datalist" @click="inDetails">
+		<view class="content" v-for="(item,index) in datalist" @click="inDetails" :key="index">
 			<view class="content-one">
 				<text class="content-one-first">{{item.title}}</text>
 				<text class="content-one-second">{{item.data}}</text>
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="header">
-			<view class="content" v-for="(item,index) in goodsList">
+			<view class="content" v-for="(item,index) in goodsList" :key="index">
 				<view class="content-one">
 					<text class="content-one-first">{{item.title}}</text>
 					<text class="content-one-second">11.26</text>