From 4904f810c4f454559b09bffcf0c8e57bcbd0d32d Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 20 Feb 2024 15:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                          | 2 +-
 pages/admin/stockOut/index.vue   | 1 +
 pages/index/index.vue            | 5 +++++
 pages/users/login/login_copy.vue | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/App.vue b/App.vue
index 6fa2369..7793ebf 100644
--- a/App.vue
+++ b/App.vue
@@ -32,7 +32,7 @@
 		history
 	} from '@/api/public.js'
 	import Routine from './libs/routine.js';
-import { Toast } from "./libs/uniApi";
+  import { Toast } from "./libs/uniApi";
 
 	export default {
 		data() {
diff --git a/pages/admin/stockOut/index.vue b/pages/admin/stockOut/index.vue
index a783911..89c2f67 100644
--- a/pages/admin/stockOut/index.vue
+++ b/pages/admin/stockOut/index.vue
@@ -315,6 +315,7 @@
         this.getCartNum();
       },
       scanCode() {
+        // return this.addCartGoods('6944411605079');
         const that = this
         uni.scanCode({
           scanType: ["qrCode", "barCode", "datamatrix", "pdf417"],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 754fc2f..c2e636f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1028,8 +1028,13 @@ import { Toast } from '../../libs/uniApi';
       },
       //个人详情
       logout() {
+        // #ifdef H5
+        this.$refs.popup1.open()
+        // #endif
+        // #ifndef H5
         if(ENV=='prod') this.byset()
         else this.$refs.popup1.open()
+        // #endif
       },
 
       //登录
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 00d363e..2c6c8f1 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -187,9 +187,9 @@
 				<button form-type="submit" @click="auth_token = ''" class="confirmBnt back">返回</button>
 			</view>
 		</form>
-		<view class="copyright" @click="goCopyUrl">
+		<!-- <view class="copyright" @click="goCopyUrl">
 			{{ copyright.status == -1 ? `${copyright.year} ${copyright.url}` : copyright.Copyright }}
-		</view>
+		</view> -->
 
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>