Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
						commit
						c196e69668
					
				| 
						 | 
					@ -87,11 +87,18 @@
 | 
				
			||||||
            <div v-for="(img, index) in imgList" :key="index" class="upload-item">
 | 
					            <div v-for="(img, index) in imgList" :key="index" class="upload-item">
 | 
				
			||||||
              <image :src="img.url" style="width: 160rpx; height: 160rpx" mode="aspectFill"></image>
 | 
					              <image :src="img.url" style="width: 160rpx; height: 160rpx" mode="aspectFill"></image>
 | 
				
			||||||
              <view class="delete-btn" @click.stop="deleteImage(index)">×</view>
 | 
					              <view class="delete-btn" @click.stop="deleteImage(index)">×</view>
 | 
				
			||||||
 | 
					              <PreviewImg :imgUrl="img.url" />
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="upload" @click="uploadImg" v-if="imgList.length < 3">+</div>
 | 
					            <div class="upload" @click="uploadImg" v-if="imgList.length < 3">+</div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </uni-col>
 | 
					        </uni-col>
 | 
				
			||||||
      </uni-row>
 | 
					      </uni-row>
 | 
				
			||||||
 | 
					      <uni-row style="display: flex; align-items: center">
 | 
				
			||||||
 | 
					        <uni-col :span="4">备注:</uni-col>
 | 
				
			||||||
 | 
					        <uni-col :span="20">
 | 
				
			||||||
 | 
					          <uni-easyinput placeholder="请输入备注" v-model="remark" :clearable="false" />
 | 
				
			||||||
 | 
					        </uni-col>
 | 
				
			||||||
 | 
					      </uni-row>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div class="btn">
 | 
					    <div class="btn">
 | 
				
			||||||
      <!-- <button class="btn-cont" @click="reject">取消</button> -->
 | 
					      <!-- <button class="btn-cont" @click="reject">取消</button> -->
 | 
				
			||||||
| 
						 | 
					@ -108,6 +115,7 @@ import ScanQrCode from '@/pages/devicesSearch/ScanQrCode.vue'
 | 
				
			||||||
import { baseURL } from '@/utils/http'
 | 
					import { baseURL } from '@/utils/http'
 | 
				
			||||||
import { useMemberStore } from '@/stores'
 | 
					import { useMemberStore } from '@/stores'
 | 
				
			||||||
import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 | 
					import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 | 
				
			||||||
 | 
					import PreviewImg from '@/components/PreviewImg/index.vue'
 | 
				
			||||||
const memberStore = useMemberStore()
 | 
					const memberStore = useMemberStore()
 | 
				
			||||||
const backPerson = ref('')
 | 
					const backPerson = ref('')
 | 
				
			||||||
const phone = ref('')
 | 
					const phone = ref('')
 | 
				
			||||||
| 
						 | 
					@ -118,6 +126,7 @@ const bmFileInfos = ref([])
 | 
				
			||||||
const qrCode = ref('') //二维码
 | 
					const qrCode = ref('') //二维码
 | 
				
			||||||
const maInfo = ref({}) //二维码
 | 
					const maInfo = ref({}) //二维码
 | 
				
			||||||
const scanQrCodeRef = ref(null)
 | 
					const scanQrCodeRef = ref(null)
 | 
				
			||||||
 | 
					const remark = ref('')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// 二维码扫码
 | 
					// 二维码扫码
 | 
				
			||||||
| 
						 | 
					@ -237,6 +246,7 @@ const submitCode = () => {
 | 
				
			||||||
        badNum: apDetection.value == '不合格' ? 1 : 0,
 | 
					        badNum: apDetection.value == '不合格' ? 1 : 0,
 | 
				
			||||||
        bmFileInfos: bmFileInfos.value,
 | 
					        bmFileInfos: bmFileInfos.value,
 | 
				
			||||||
        preNum: 1,
 | 
					        preNum: 1,
 | 
				
			||||||
 | 
					        remark: remark.value,
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
    let param = {
 | 
					    let param = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue