From 79ced22480de3c05ed3e4f5dfcf7849ebdcbfbad Mon Sep 17 00:00:00 2001
From: "3075067877@qq.com" <3075067877@qq.com>
Date: Mon, 19 Feb 2024 10:51:36 +0800
Subject: [PATCH] before test

---
 uniapp_project_code/readme.md                      |   2 +
 uniapp_project_code/src/App.vue                    |   8 ++
 .../src/components/index/page_standby.vue          |  31 +++++-
 .../src/components/index/view_footer.nvue          |   7 +-
 .../src/components/index/view_header.nvue          |  32 ++++++-
 uniapp_project_code/src/components/login/form.vue  |  18 +++-
 uniapp_project_code/src/components/login/logo.vue  |   2 +-
 .../src/components/login/pads_picker.vue           |  58 ++++++++++-
 .../src/components/login/setting_mask.vue          |  33 ++++++-
 uniapp_project_code/src/components/pay/paying.vue  |   4 +-
 uniapp_project_code/src/pages.json                 |   7 +-
 uniapp_project_code/src/pages/index/-index.nvue    |   4 +-
 uniapp_project_code/src/pages/index/index.vue      |  15 +--
 uniapp_project_code/src/pages/index/standby.nvue   |   2 +-
 uniapp_project_code/src/pages/login/index.vue      | 106 ++++++++++++++++++++-
 uniapp_project_code/src/pages/login/success.vue    |  65 ++++++++++++-
 uniapp_project_code/src/pages/pay/index.vue        |   9 +-
 uniapp_project_code/src/static/logo@2x.png         | Bin 0 -> 20383 bytes
 uniapp_project_code/src/utils/server.js            |   4 +-
 uniapp_project_code/src/utils/util.js              |   2 +-
 20 files changed, 372 insertions(+), 37 deletions(-)
 create mode 100644 uniapp_project_code/src/static/logo@2x.png

diff --git a/uniapp_project_code/readme.md b/uniapp_project_code/readme.md
index 56af1d6..49f14db 100644
--- a/uniapp_project_code/readme.md
+++ b/uniapp_project_code/readme.md
@@ -10,4 +10,6 @@
 6. 不能在 style 中引入字体文件
 7. 不支持在 nvue 页面使用 typescript/ts。
 
+### vue注意事项
+1. vue版本3.2, 不支持defineModel
 参考: https://uniapp.dcloud.net.cn/tutorial/page.html#nvue-%E5%BC%80%E5%8F%91%E4%B8%8E-vue-%E5%BC%80%E5%8F%91%E7%9A%84%E5%B8%B8%E8%A7%81%E5%8C%BA%E5%88%AB
\ No newline at end of file
diff --git a/uniapp_project_code/src/App.vue b/uniapp_project_code/src/App.vue
index 7fac56a..9f682d2 100644
--- a/uniapp_project_code/src/App.vue
+++ b/uniapp_project_code/src/App.vue
@@ -14,6 +14,7 @@
 export default {
   onLaunch() {
     console.log("App Launch default");
+    this.globalData.autoLogin = true;
   },
   onShow() {
     console.log("App Show default");
@@ -22,6 +23,7 @@ export default {
     console.log("App Hide default");
   },
   globalData: {
+    autoLogin: false,
     goodsList : [],
     shopList : [],
     accountInfo : {
@@ -31,6 +33,12 @@ export default {
       password: "123456",
       assistant_client:"PC",
       token: "e6cabeae-0c1a-11ee-aa40-5254005df464",
+      role:""
+    },
+    stadiumInfo:{
+      id: "", //stadium_id
+      brand_id: "",
+      venue_name:"",
     },
     loginInfo : {
       phone: "",
diff --git a/uniapp_project_code/src/components/index/page_standby.vue b/uniapp_project_code/src/components/index/page_standby.vue
index 854ff16..0563863 100644
--- a/uniapp_project_code/src/components/index/page_standby.vue
+++ b/uniapp_project_code/src/components/index/page_standby.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="content_title">
-			<text class="txt">欧轩智能场馆丛云店</text>
+			<text class="txt" @click="secretClickBackToSetting">欧轩智能场馆丛云店</text>
 		</view>
 		<view class="content_info">
 			<text class="txt">欢迎使用自助收银</text>
@@ -9,7 +9,7 @@
 		<image class="content_tip" src="/static/index_tips.png" mode="scaleToFill" />
 		<image class="content_img" src="/static/index_person.png" mode="scaleToFill" />
 		<!-- <main-click-btn > -->
-		<view class="content_btn" @click="clickToUse">
+		<view class="content_btn" @click="toIndex">
 			<image class="icon_saoma" src="/static/images/saoma.png" mode="scaleToFill" />
 			<text class="txt">请扫描商品条形码</text>
 		</view>
@@ -24,9 +24,36 @@
 	import mainClickBtn from '@/components/index/button_green_square.vue';
 	import util from "@/utils/util.js"
 
+	import {
+		onMounted,
+		ref
+	} from 'vue'
+
+	const countClick = ref(0)
+
 	function clickToUse() {
 		util.routeTo(`/pages/login/success`, 'nT');
 	}
+
+	const toIndex = ()=>{
+		util.routeTo(`/pages/index/index`, 'nT');
+	}
+
+	function secretClickBackToSetting() {
+		//2.5秒内快速10次点击进入设置页面
+		countClick.value++
+		console.log("tabChnage: ",countClick.value)
+		if(countClick.value >= 10){
+			countClick.value = 0
+			util.routeTo(`/pages/login/success`, 'nT');
+		}
+		secretClick()
+	}
+
+	const secretClick = util.debounce(function(){
+		countClick.value = 0
+	},2500,false)
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/uniapp_project_code/src/components/index/view_footer.nvue b/uniapp_project_code/src/components/index/view_footer.nvue
index b07f846..2b69828 100644
--- a/uniapp_project_code/src/components/index/view_footer.nvue
+++ b/uniapp_project_code/src/components/index/view_footer.nvue
@@ -1,11 +1,11 @@
 <template>
     <view class="footer-box">
-        <view class="f-user">
+        <view class="f-user" v-if="userLogin">
             <!-- <image src="/static/index/camera_icon.png" mode="scaleToFill" /> -->
             <text class="txt">猫星人（18316553589）</text>
         </view>
-        <view class="f-line"></view>
-        <view class="f-vip-info" v-if="true">
+        <view class="f-line" v-if="userLogin"></view>
+        <view class="f-vip-info" v-if="userLogin">
             <view class="f-coupon">
                 <text class="txt1">优惠券：</text>
                 <text class="txt2">-￥</text>
@@ -83,6 +83,7 @@ import util from "@/utils/util.js"
 
 	})
 
+    let userLogin = ref(false)
 	let inputValue = ref("")
 	let activeValue = ref("")
 	
diff --git a/uniapp_project_code/src/components/index/view_header.nvue b/uniapp_project_code/src/components/index/view_header.nvue
index d7c648a..0c7a9a7 100644
--- a/uniapp_project_code/src/components/index/view_header.nvue
+++ b/uniapp_project_code/src/components/index/view_header.nvue
@@ -2,10 +2,10 @@
 	<view class="header-box" :style="[{ background: props.backgroundCustom }, getBorderStyle]">
 		<view class="video-tip">
 			<image class="v-image" src="/static/index/camera_icon.png" mode="widthFix" />
-			<text class="v-text">您已进入视频覆盖区{{ props.backgroundCustom }}</text>
+			<text class="v-text">您已进入视频覆盖区</text>
 		</view>
 		<view class="cancel-button" @click="handle_closeUse">
-			<text class="v-text"> 取消交易</text>
+			<text class="v-text">{{countDown}} 取消交易</text>
 		</view>
 	</view>
 </template>
@@ -13,6 +13,7 @@
 <script setup>
 //触发自定义事件
 import util from "@/utils/util.js"
+import { ref,onMounted,onBeforeUnmount } from 'vue'
 import { defineEmits, defineProps, computed } from 'vue'
 const emits = defineEmits(['closeUse'])
 const props = defineProps({
@@ -26,6 +27,30 @@ const props = defineProps({
 	}
 })
 
+const countDown = ref(90)
+let timer = ref(null)
+
+onMounted(async (res) => {
+	setCountDown()
+})
+onBeforeUnmount(() => {
+	clearInterval(timer)
+	timer = null
+})
+
+function setCountDown() {
+	clearInterval(timer)
+	timer = null
+	timer = setInterval(() => {
+		countDown.value--
+		if (countDown.value <= 1) {
+			clearInterval(timer)
+			timer = null
+			util.routeTo(`/pages/index/standby`, 'rL');
+		}
+	}, 1000)
+}
+
 const getBorderStyle = computed(() => {
 	if (props.needBorder) {
 		return "border-bottom: 1rpx solid #F5F7F8;"
@@ -35,6 +60,9 @@ const getBorderStyle = computed(() => {
 })
 
 const handle_closeUse = () => {
+	// clearInterval(timer)
+	// timer = null
+
 	util.routeTo(`/pages/index/standby`, 'rL');
 	// emits("closeUse", "false")
 }
diff --git a/uniapp_project_code/src/components/login/form.vue b/uniapp_project_code/src/components/login/form.vue
index a919c6b..556fcc6 100644
--- a/uniapp_project_code/src/components/login/form.vue
+++ b/uniapp_project_code/src/components/login/form.vue
@@ -3,11 +3,19 @@
         <view class="login-form">
             <view class="lf-item">
                 <image class="li-icon" mode="aspectFit" src="/static/images/person.png"></image>
-                <input class="li-ipt" placeholder="请输入登录账号" />
+                <input class="li-ipt" :value="props.brand_id"  placeholder="请输入品牌ID" 
+				@input="emit('update:brand_id', $event.detail.value)"/>
+            </view>
+            <view class="lf-item">
+                <image class="li-icon" mode="aspectFit" src="/static/images/person.png"></image>
+                <input class="li-ipt" :value="props.username"  placeholder="请输入登录账号" 
+				@input="emit('update:username', $event.detail.value)"/>
             </view>
             <view class="lf-item">
                 <image class="li-icon" mode="aspectFit" src="/static/images/lock.png"></image>
-                <input class="li-ipt" placeholder="请输入登录密码" />
+                <input class="li-ipt" type="safe-password" 
+                :password="true" :value="props.password" placeholder="请输入登录密码" 
+				@input="emit('update:password', $event.detail.value)"/>
             </view>
         </view>
     </view>
@@ -15,6 +23,12 @@
 </template>
 
 <script setup>
+import {
+	ref,
+} from 'vue'
+//define emits or props
+const props = defineProps(['username','password','brand_id'])
+const emit = defineEmits(['update:username','update:password','update:brand_id'])
 
 </script>
 
diff --git a/uniapp_project_code/src/components/login/logo.vue b/uniapp_project_code/src/components/login/logo.vue
index 80054e9..ab718d3 100644
--- a/uniapp_project_code/src/components/login/logo.vue
+++ b/uniapp_project_code/src/components/login/logo.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="logo-box">
-        <image class="lb-img" mode="aspectFill"></image>
+        <image class="lb-img" mode="aspectFill" src="../../static/logo@2x.png"></image>
     </view>
 </template>
 
diff --git a/uniapp_project_code/src/components/login/pads_picker.vue b/uniapp_project_code/src/components/login/pads_picker.vue
index b78e6da..c0492c7 100644
--- a/uniapp_project_code/src/components/login/pads_picker.vue
+++ b/uniapp_project_code/src/components/login/pads_picker.vue
@@ -3,9 +3,9 @@
         <view class="pp-content">
             <view class="pc-text">请选择平板</view>
             <view class="pc-frame">
-                <picker class="pt-picker" mode="time">
+                <picker class="pt-picker" mode="selector" :range="padList" @change="padBindChange">
                     <view class="pp-box">
-                        <view class="pb-text">请选择平板</view>
+                        <view class="pb-text">{{ padList[selectIndex]|| '请选择平板'}}</view>
                         <image class="pt-icon" mode="aspectFtt" src="/static/images/triangle.png"></image>
                     </view>
                 </picker>
@@ -15,10 +15,60 @@
     </view>
 </template>
 
-<script>
-export default {
+<script setup>
+import {
+    onMounted,
+    ref,
+    watchEffect
+} from 'vue'
 
+const selectIndex = ref("");
+
+//define emits or props
+const emits = defineEmits(['pickerChange'])
+const props = defineProps({
+    padList: {
+        type: Array,
+        default: []
+    },
+    padListOrigin: {
+        type: Array,
+        default: []
+    }
+
+})
+
+onMounted(() => {
+});
+
+watchEffect(() => {
+    console.log("watchEffect", props.padListOrigin)
+    if (props.padListOrigin.length > 0) {
+        autoShowBackStadium()
+    }
+})
+
+function padBindChange(e) {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    let index = e.detail.value;
+    selectIndex.value = index;
+    emits("pickerChange", index)
+}
+
+function autoShowBackStadium(){
+    console.log("autoShowBackStadium")
+    let stadiumInfo = uni.getStorageSync("stadiumInfo")
+    if(stadiumInfo){
+        let index = props.padListOrigin.findIndex((e)=>{
+            return e.id == stadiumInfo.id
+        })
+        if(index != -1){
+            selectIndex.value = index
+            console.log("autoShowBackStadium set index: ",index)
+        }
+    }
 }
+
 </script>
 
 <style lang="scss">
diff --git a/uniapp_project_code/src/components/login/setting_mask.vue b/uniapp_project_code/src/components/login/setting_mask.vue
index 3a5fe3b..47b553f 100644
--- a/uniapp_project_code/src/components/login/setting_mask.vue
+++ b/uniapp_project_code/src/components/login/setting_mask.vue
@@ -5,8 +5,8 @@
             <view class="sc-title">平板信息配置</view>
             <view class="sc-container">
                 <view class="sc-line">
-                    <view class="sl-desc">当前设备名称：前门平板</view>
-                    <button class="sd-btn">更新配置</button>
+                    <view class="sl-desc">当前设备名称：收银端</view>
+                    <button class="sd-btn" @click="logout">退出登录</button>
                 </view>
                 <view class="sc-line">
                     <view class="sl-desc">屏幕适配设置</view>
@@ -24,6 +24,35 @@
 		emits("closeSetting","false")
 	}
 
+    const logout = ()=>{
+        console.log("logout")
+        
+        uni.showModal({
+            title: '提示',
+            content: '确定退出登录？',
+            success: function (res) {
+                if (res.confirm) {
+                    console.log('用户点击确定');
+                    handle_logout()
+                } else if (res.cancel) {
+                    console.log('用户点击取消');
+                }
+            }
+        });
+
+    }
+    const handle_logout = ()=>{
+        getApp().globalData.stadiumInfo = {}
+        getApp().globalData.accountInfo = {}
+        uni.removeStorageSync("stadiumInfo")
+        uni.removeStorageSync("accountInfo")
+        uni.removeStorageSync("userInfo")
+        
+        uni.reLaunch({
+            url: '/pages/login/index'
+        });
+    }
+
 </script>
 
 <style lang="scss">
diff --git a/uniapp_project_code/src/components/pay/paying.vue b/uniapp_project_code/src/components/pay/paying.vue
index c6aa7ad..0da5e6c 100644
--- a/uniapp_project_code/src/components/pay/paying.vue
+++ b/uniapp_project_code/src/components/pay/paying.vue
@@ -3,7 +3,7 @@
 
 		<text class="p-text">支付金额</text>
 
-		<text class="p-total">￥{{props.payTotal||"0.00"}}</text>
+		<text class="p-total">￥{{payTotal||"0.00"}}</text>
 		
 		<view class="p-zhichi">
 			<view class="p-line"></view>
@@ -27,7 +27,7 @@
 
 
 		<view class="p-user">
-			<text class="p-txt">猫星人（18316553589）</text>
+			<text class="p-txt">未登录（00000000000）</text>
 		</view>
 	</view>
 
diff --git a/uniapp_project_code/src/pages.json b/uniapp_project_code/src/pages.json
index da98aac..e93ce8f 100644
--- a/uniapp_project_code/src/pages.json
+++ b/uniapp_project_code/src/pages.json
@@ -1,24 +1,25 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/index/standby",
+			"path": "pages/login/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/index/standby",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/login/index",
+			"path": "pages/index/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 
+
 		{
 			"path": "pages/pay/index",
 			"style": {
diff --git a/uniapp_project_code/src/pages/index/-index.nvue b/uniapp_project_code/src/pages/index/-index.nvue
index 7d9fea8..aa8d7eb 100644
--- a/uniapp_project_code/src/pages/index/-index.nvue
+++ b/uniapp_project_code/src/pages/index/-index.nvue
@@ -111,9 +111,9 @@ import { uni } from "@dcloudio/uni-h5";
 			console.log("onload:",res)
 			await this.updateGoodsList()
 			// let skulist = this.searchGoodBySku("1000000001")
-			let skulist = await this.searchGoodBySku("10000012")
+			// let skulist = await this.searchGoodBySku("10000012")
 			//将skulist合并到shopList
-			this.shopList = this.shopList.concat(skulist)
+			// this.shopList = this.shopList.concat(skulist)
 			console.log("skulist:",this.shopList)
 			// this.test()
 
diff --git a/uniapp_project_code/src/pages/index/index.vue b/uniapp_project_code/src/pages/index/index.vue
index 2f9a8c6..265d2ed 100644
--- a/uniapp_project_code/src/pages/index/index.vue
+++ b/uniapp_project_code/src/pages/index/index.vue
@@ -136,17 +136,16 @@
 					console.log("skulist:", this.shopList)
 				})
 
-				console.log("test set SKU 10000012")
-				let skulist = await this.searchGoodBySku("10000012")
-				//将skulist合并到shopList
-				this.shopList = this.shopList.concat(skulist)
+			
 				this.setFooterHeight()
 
+				console.log("test set SKU 10000012")
+				// let skulist = await this.searchGoodBySku("10000012")
+				// this.shopList = this.shopList.concat(skulist)
 			}, 1000)
 		},
 		methods: {
 			clickToPay() {
-
 				// 将shopList进行精简为						{
 				// 			"id": 57,
 				// 			"name": "光明纯牛奶",
@@ -170,6 +169,10 @@
 					shopListTotalPrice: this.shopListTotalPrice,
 					shopListTotalCount: this.shopListTotalCount
 				}
+				console.log("clickToPay", _query)
+				if(this.shopListTotalPrice<=0){
+					return util.showNone("请先添加商品")
+				}
 				util.routeTo(`/pages/pay/index?query=${JSON.stringify(_query)}`, 'nT');
 			},
 			clickToUse() {
@@ -188,7 +191,7 @@
 				this.showEndPhoneBox = !this.showEndPhoneBox
 			},
 			handle_clickQR() {
-				util.showNone("输入条形码")
+				// util.showNone("输入条形码")
 				this.showQRInputBox = !this.showQRInputBox
 			},
 			handle_clickCommit_qr(res) {
diff --git a/uniapp_project_code/src/pages/index/standby.nvue b/uniapp_project_code/src/pages/index/standby.nvue
index d2de1e8..4637d22 100644
--- a/uniapp_project_code/src/pages/index/standby.nvue
+++ b/uniapp_project_code/src/pages/index/standby.nvue
@@ -1,6 +1,6 @@
 <template>
     <view>
-        <page-standby  @click="toIndex"></page-standby>
+        <page-standby ></page-standby>
     </view>
 </template>
 
diff --git a/uniapp_project_code/src/pages/login/index.vue b/uniapp_project_code/src/pages/login/index.vue
index 189dd72..7c366cc 100644
--- a/uniapp_project_code/src/pages/login/index.vue
+++ b/uniapp_project_code/src/pages/login/index.vue
@@ -6,7 +6,11 @@
             </view>
             <view class="li-name">欢迎使用欧轩智能场馆平板端系统</view>
             <view class="li-from">
-                <login-form></login-form>
+                <login-form 
+                :username="username" @update:username="update_username" 
+				:password="password" @update:password="update_password" 
+                :brand_id="brand_id" @update:brand_id="update_brand_id"
+				 ></login-form>
             </view>
             
             <view class="li-tip">*登录账号密码请从pc端后台管理【设备运营管理平板管理】里获取</view>
@@ -25,10 +29,108 @@
     import loginButton from '@/components/login/button.vue';
 	
 	import util from "@/utils/util.js"
+	import {
+		API
+	} from "@/utils/api";
+	import {
+		ox
+	} from "@/utils/server";
+
+	import {
+		onMounted,
+		ref,
+	} from 'vue'
+    import { onLoad,onReady } from '@dcloudio/uni-app';
+
+    onReady(async () => {
+        autoLogin()
+    });
+    // import { uni } from '@dcloudio/uni-h5';
 	
+	const username = ref('');
+	const password = ref('');
+    const brand_id = ref(''); 
+	
+	const update_username = (val)=>{username.value = val}
+	const update_password = (val)=>{password.value = val}
+    const update_brand_id = (val)=>{brand_id.value = val}
+    //登录点击,调用登录接口,成功后跳转到首页并存储账户密码到本地
 	function clickLogin(){
-		util.routeTo(`/pages/login/success`, 'nT');
+
+        //测试代码
+        // saveUserInfo({username:username.value,password:password.value,brand_id:brand_id.value})
+        // return
+
+        util.showLoad('登录中...');
+        let urlParams = {
+            assistant_client: 'pc',
+            brand_id:brand_id.value,
+            username: username.value,
+            password: password.value
+        }
+        ox.post({
+            url: API.padLogin,
+            data: urlParams,
+            isDefaultGet: true,
+            failMsg: '操作失败！'
+        })
+        .then(data => {
+            util.hideLoad();
+            console.log("padLogin suc: ", data)
+
+            //登录成功,存储账户密码到本地
+            let {token,role} = data
+            let autoLogin = getApp().globalData.autoLogin
+            let stadiumInfo = uni.getStorageSync('stadiumInfo');
+            saveUserInfo({username:username.value,password:password.value,brand_id:brand_id.value,token,role})
+			
+            //跳转到首页
+            if(autoLogin&&stadiumInfo){
+                getApp().globalData.autoLogin = false
+                setTimeout(()=>{
+                    util.routeTo(`/pages/index/index`, 'nT');
+                },1000)
+				return util.showNone("自动登录成功")
+            }else{
+                getApp().globalData.autoLogin = false
+                setTimeout(()=>{
+                    util.routeTo(`/pages/login/success`, 'nT');
+                },1000)
+				return util.showNone("自动登录成功,请先选择门店")
+            }
+            
+
+            return data
+        }).finally(()=>{
+            util.hideLoad();
+        })
+        
 	}
+    function saveUserInfo(userInfo){
+        uni.setStorageSync('userInfo', userInfo);
+        getApp().globalData.accountInfo.brand_id = userInfo.brand_id
+        getApp().globalData.accountInfo.username = userInfo.username
+        getApp().globalData.accountInfo.password = userInfo.password
+        getApp().globalData.accountInfo.token = userInfo.token
+        getApp().globalData.accountInfo.role = userInfo.role
+
+        console.log('存储到本地localStorage '+uni.getStorageSync('userInfo').username)
+    }
+    function autoLogin(){
+        let userInfo = uni.getStorageSync('userInfo');
+        console.log(`page-onReady autoLogin userInfo: `,userInfo||"none")
+
+        if(userInfo){
+            username.value = userInfo.username
+            password.value = userInfo.password
+            brand_id.value = userInfo.brand_id
+            clickLogin()
+        }
+    }
+
+    
+	
+	
 </script>
 
 <style lang="scss">
diff --git a/uniapp_project_code/src/pages/login/success.vue b/uniapp_project_code/src/pages/login/success.vue
index 1943d4e..e3cbb75 100644
--- a/uniapp_project_code/src/pages/login/success.vue
+++ b/uniapp_project_code/src/pages/login/success.vue
@@ -7,13 +7,14 @@
                 <view class="ld-line">欢迎登录欧轩智能场馆平板端系统！</view>
             </view>
             <view class="ls-pads">
-                <pads-picker></pads-picker>
+                <pads-picker :padList="padList" :padListOrigin="padListOrigin" @pickerChange="handle_pickerChange"></pads-picker>
             </view>
             <view class="ls-botton">
                 <login-button @click="clickJumpIndex">进入使用</login-button>
             </view>
             <view class="ls-links">
                 <view class="ll-item" @click="clickUpdate">更新</view>
+				<view class="ll-item" @click="clickUpdatePadList">更新门店</view>
                 <view class="ll-item" @click="clickSetting">设置</view>
             </view>
         </view>
@@ -29,14 +30,30 @@ import loginButton from '@/components/login/button.vue';
 import settingMask from '@/components/login/setting_mask.vue';
 
 import { ref } from 'vue'
+import { onReady } from '@dcloudio/uni-app';
 import util from "@/utils/util.js"
+import {API} from "@/utils/api";
+import {ox} from "@/utils/server";
 
-let showSettingMask = ref(true)
+let showSettingMask = ref(false)
+const padList = ref([])
+const selectIndex = ref("")
+const padListOrigin = ref([])
+
+
+onReady(async () => {
+    updatePadList()
+});
 
 function handle_closeSetting(val){
 	console.log("handle_closeSetting",val)
 	showSettingMask.value = !showSettingMask.value
 }
+function handle_pickerChange(val){
+    console.log("handle_pickerChange",val)
+    selectIndex.value = val
+    saveStadiumInfo(val)
+}
 
 function clickJumpIndex(){
 	util.routeTo(`/pages/index/index`, 'nT');
@@ -47,6 +64,50 @@ function clickSetting(){
 function clickUpdate(){
     util.showNone("更新功能暂不可用")
 }
+function clickUpdatePadList(){
+    console.log("clickUpdatePadList")
+    updatePadList()
+}
+
+function saveStadiumInfo(val){
+    let item = padListOrigin.value[val]
+    let {id:stadium_id} = item
+    getApp().globalData.accountInfo.store_id = stadium_id
+    getApp().globalData.stadiumInfo = item
+    uni.setStorageSync("stadiumInfo",item)
+
+}
+
+
+
+function updatePadList(){
+    console.log("updatePadList")
+    util.showLoad('更新门店列表...');
+    let {brand_id,token} = getApp().globalData.accountInfo
+    let urlParams = {
+            brand_id,token,
+            page: 1,
+            page_size: 200
+        }
+    ox.get({
+        url: API.padList,
+        data: urlParams,
+        isDefaultGet: true,
+        failMsg: '操作失败！'
+    })
+    .then(data => {
+        util.hideLoad();
+        console.log("updatePadList suc: ", data)
+        padListOrigin.value = data.list
+        padList.value = data.list.map((e)=>{
+            return e.venue_name
+        })
+      
+        return data
+    }).finally(()=>{
+        util.hideLoad();
+    })
+}
 
 </script>
 
diff --git a/uniapp_project_code/src/pages/pay/index.vue b/uniapp_project_code/src/pages/pay/index.vue
index ab1b8d7..352bc14 100644
--- a/uniapp_project_code/src/pages/pay/index.vue
+++ b/uniapp_project_code/src/pages/pay/index.vue
@@ -4,7 +4,7 @@
 		<view v-if="paySuccessStatus==0">
 			<view-header class="mheader" :backgroundCustom="('none')" :needBorder="(false)" 
 			@closeUse=""></view-header>
-			<paying v-if="true" @clickVipCard="handle_clickVipCard"></paying>
+			<paying v-if="true" :payTotal="payTotal"  @clickVipCard="handle_clickVipCard"></paying>
 		</view>
 		<pay-success v-else></pay-success>
 		
@@ -43,6 +43,12 @@
 			'input-qr-box': inputQrBox,
 			'keyboard-listener': keyboardListener,
 		},
+		computed: {
+			payTotal() {//子组件中支付金额
+				let _payTotal = this.dataQuery.amount
+				return _payTotal.toFixed(2)||"0.00"
+			}
+		},
 		watch:{
 
 		},
@@ -77,6 +83,7 @@
 				} 
 				console.log("setPayData2:",_data)
 				this.dataQuery = _data
+				
 			},
 			// 字符数字10，11，12，13，14，15开头是WECHAT_MICROPAY,28是ALI_BARCODEPAY
 			getPayType(code){
diff --git a/uniapp_project_code/src/static/logo@2x.png b/uniapp_project_code/src/static/logo@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d1e646a121df0a073f2f6b72496e4775c84dc4e
GIT binary patch
literal 20383
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

literal 0
HcmV?d00001

diff --git a/uniapp_project_code/src/utils/server.js b/uniapp_project_code/src/utils/server.js
index a6da4ad..1fd49fa 100644
--- a/uniapp_project_code/src/utils/server.js
+++ b/uniapp_project_code/src/utils/server.js
@@ -10,7 +10,7 @@ export class Server {
 			// if(method === 'POST'&&_token)url = url + `?token=${_token}`
 			uni.request({
 				url,
-				timeout: 60000,
+				timeout: 20000,
 				sslVerify:false,
 				data,
 				method, // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
@@ -36,6 +36,7 @@ export class Server {
 					} 
 
 					if(islog){
+						console.log('islog req success---->')
 						let weburl = getWebURL(data,url)
 						let temp = url.split("?")[0].split("/")
 						let postName = temp[temp.length-1]
@@ -64,6 +65,7 @@ export class Server {
 					// if(util.debug){
 						util.showLog(data,url,result)
 					// }
+
 				}
 				
 			})
diff --git a/uniapp_project_code/src/utils/util.js b/uniapp_project_code/src/utils/util.js
index cc80cb0..ae0dcac 100644
--- a/uniapp_project_code/src/utils/util.js
+++ b/uniapp_project_code/src/utils/util.js
@@ -6,7 +6,7 @@ export const specialReg = new RegExp("[^a-zA-Z0-9\_\u4e00-\u9fa5]","i");
 
 export const debug = false //是否开启debug模式,使用非离线工程模式调试
 
-export const isExportLog = false //是否开启log输出
+export const isExportLog = true //是否开启log输出
 
 export const formatTime = date => {
   const year = date.getFullYear()