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

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)
       },