Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

.env.js

 (function () {
-	let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境 | prod:生产环境
+	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;
     let VERSION_NUMBER = '1.3.9';//版本号
     //小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频

src/components/createCom/XhScan.vue

@@ -31,8 +31,14 @@
 				const self = this
 				uni.scanCode({
 				    success: function (res) {
-							self.dataValue = res.result
-							self.valueChange(res.result)
+							let result = res.result
+							if (result.substring(0, 4) === 'http') {
+								const arr = result.split('/#/')
+								console.log("arr", arr)
+								result = arr[1]
+							}
+							self.dataValue = result
+							self.valueChange(result)
 				    }
 				});
 			}

src/components/select-parts/index.vue

@@ -5,7 +5,7 @@
     </view>
     <view class="u-flex right">
       <view class="right-img">
-        <u-image :src="info.images || noPartsImage" width="200rpx" height="200rpx" />
+        <u-image :src="partsImage(info.images)" width="200rpx" height="200rpx" />
       </view>
       <view class="u-flex right-content">
         <view class="right-content-name">{{ info.name }}</view>
@@ -45,11 +45,6 @@
 				}
       }
 		},
-    computed: {
-      noPartsImage() {
-				return process.uniEnv.qn_base_url + 'morentupian.png'
-			}
-    },
 		data() {
 			return {
 			}
@@ -57,6 +52,9 @@
 		created() {
 		},
 		methods: {
+      partsImage(images) {
+        return images ? process.uniEnv.systemUrl.apiUrl + images : process.uniEnv.qn_base_url + 'morentupian.png'
+      },
       selectChange(event) {
         this.$emit('selectChange', event.value)
       },

src/pages/mine/warehouse/index.vue

@@ -190,7 +190,7 @@
 					this.$refs.uToast.show({
 						title: message,
 						type: type,
-						duration: 1000,
+						duration: 1500,
 						callback: function() {}
 					})
 				})

src/pages/mine/warehouse/partsDetail.vue

@@ -52,6 +52,9 @@
 			<u-button :custom-style="customStyle" shape="circle" @click="handleClick" type="primary">
 				{{buttonText}}
 			</u-button>
+		</view>
+		<view>
+			<u-toast ref="uToast" />
 		</view>
 	</view>
 </template>
@@ -194,7 +197,7 @@
 		},
 		methods: {
 			handleClick() {
-				this.$u.api[this.operateType](this.info.id).then(res => {
+				this.$u.api[this.buttonOperateType](this.info.id).then(res => {
 					var type = 'error'
 					var message = res.message
 					if (res.code == 200) {
@@ -206,7 +209,7 @@
 					this.$refs.uToast.show({
 						title: message,
 						type: type,
-						duration: 1000,
+						duration: 1500,
 						callback: function() {}
 					})
 					var pages = getCurrentPages();

src/pages/mine/warehouse/spare.vue

@@ -11,7 +11,7 @@
 		</view>
 		<NoOrder v-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无备件信息" :customStyle="noPartsCustomStyle" />
 		<template v-else>
-			<view class="title-view">
+			<view class="title-view" v-if="this.loaded">
 				<view>备件列表</view>
 				<view class="title-right-view">
 					<view class="bounce-view" v-if="!showBounce" @click="showBounce = true">退件</view>

src/pages/order/detail.vue

@@ -924,7 +924,7 @@
 					this.$refs.uToast.show({
 						title: message,
 						type: type,
-						duration: 1000,
+						duration: 1500,
 						callback: function() {}
 					})
 				})

src/store/index.js

@@ -31,7 +31,7 @@ const store = new Vuex.Store({
 	state: {
 		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
 		vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {},
-		vuex_token: 'RTOKENe4a0c2fb1f93d97d58147a0d41004b00007b2e1e', //lifeData.vuex_token ? lifeData.vuex_token : '',
+		vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
 		vuex_cache: lifeData.vuex_cache ? lifeData.vuex_cache : {},
 		vuex_version: '1.0.1',
 		vuex_config: {},