Merge branch 'feature/order_edit' into dev

# Conflicts:
#	src/static/img/add.png
#	src/static/lang/en.js
#	src/static/lang/zh.js
#	src/store/index.js
#	src/utils/config.js

src/App.vue

@@ -8,8 +8,11 @@
 					url: './pages/login/login'
 				})
 			}
+      if(Authorization && !this.$store.state.userInfo){
+        this.$store.dispatch('updateUserInfo')
+      }
 			//#ifdef APP-PLUS
-			plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {                
+			plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
 					//  获取 app的version
 					let appversion = wgtinfo.version;
 					let versionCode = wgtinfo.versionCode

src/common/lang.js

@@ -3,9 +3,9 @@ import Zh from '@/static/lang/zh.js'
 
 export default {
     lang: uni.getStorageSync('locale') ? (uni.getStorageSync('locale')=='zh'?Zh:En) : Zh,
-	locale:uni.getStorageSync('locale') ? uni.getStorageSync('locale') : 'zh',
-    setLang(msg) {		
-        this.lang = msg=='zh'?Zh:En;
-		this.locale = msg
+	  locale:uni.getStorageSync('locale') ? uni.getStorageSync('locale') : 'zh',
+    setLang(msg) {
+      this.lang = msg=='zh'?Zh:En;
+		  this.locale = msg
     }
-}
+}
\ No newline at end of file

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "E&C logistics",
     "appid" : "__UNI__B690450",
     "description" : "",
-    "versionName" : "221",
-    "versionCode" : 221,
+    "versionName" : "225",
+    "versionCode" : 225,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -19,7 +19,8 @@
         },
         "modules" : {
             "VideoPlayer" : {},
-            "Barcode" : {}
+            "Barcode" : {},
+            "Camera" : {}
         },
         /* 模块配置 */
         "distribute" : {

src/static/css/create_order.css

@@ -104,7 +104,7 @@ radio{
 	margin: 0 20upx 16upx 0;
 }
 .corder-tab-top view{
-	display: block;
+	/*display: block;*/
 	width: 90%;
 	border-bottom: 1px solid var(--cdf);
 	padding-bottom: 16upx;

src/static/css/main.css

@@ -94,3 +94,34 @@ view {
 		width: 100%;
 		height: var(--status-bar-height);
 	} */
+
+.flex{
+	display: flex;
+}
+.items-center{
+	align-items: center;
+}
+.items-start{
+	align-items: start;
+}
+.items-end{
+	align-items: end;
+}
+.justify-center{
+	justify-content: center;
+}
+.justify-start{
+	justify-content: start;
+}
+.justify-end{
+	justify-content: end;
+}
+.justify-between{
+	justify-content: space-between;
+}
+.justify-around{
+	justify-content: space-around;
+}
+.flex-1{
+	flex: 1;
+}

src/store/index.js

@@ -42,7 +42,7 @@ const store = new Vuex.Store({
   actions: {
     updateUserInfo({ commit }) {
       http
-        .get('/profile')
+        .get('/app-api/member/user/get')
         .then((res) => {
           console.log('更新用户信息', res)
           commit('setUser', res.data)