Merge branch 'master' of http://192.168.30.2:3000/bonus/bonus-material-app

.vscode/settings.json

@@ -0,0 +1,14 @@
+{
+    "i18n-ally.localesPaths": [
+        "src/uni_modules/uni-table/i18n",
+        "src/uni_modules/uni-calendar/components/uni-calendar/i18n",
+        "src/uni_modules/uni-countdown/components/uni-countdown/i18n",
+        "src/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n",
+        "src/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n",
+        "src/uni_modules/uni-fav/components/uni-fav/i18n",
+        "src/uni_modules/uni-load-more/components/uni-load-more/i18n",
+        "src/uni_modules/uni-pagination/components/uni-pagination/i18n",
+        "src/uni_modules/uni-popup/components/uni-popup/i18n",
+        "src/uni_modules/uni-search-bar/components/uni-search-bar/i18n"
+    ]
+}

src/pages/login/index.vue

@@ -39,6 +39,7 @@ const loginForm = reactive({
 // 登录按钮
 const onHandleLogin = async () => {
     const res = await appLoginAPI(loginForm)
+	console.log(res)
     if (res.code === 200) {
         // 1.  获取 token 并存储
         memberStore.setToken(res.data.access_token)

src/pages/new-purchase/accept/acceptDetails.vue

@@ -46,11 +46,11 @@
 <script setup>
 import { ref, reactive } from 'vue'
 import { getPurchaseInfo } from '../../../services/purchase.js';
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad,onShow } from '@dcloudio/uni-app'
 
 
 const searchValue = ref('')
-const id = ref('')
+const id = ref('') 
 const taskId = ref('')
 const statusList = ref(["2","12"])
 const tableList = ref([])
@@ -90,6 +90,9 @@ onLoad((options)=>{
 	taskId.value = options.taskId
 	getTableList()
 })
+onShow(()=>{
+	getTableList()
+})
 </script>
 
 <style lang="scss" scoped>

src/pages/new-purchase/accept/conclusion.vue

@@ -58,9 +58,19 @@ const pass = () => {
 	let param = {
 		purchaseCheckDetailsList:[obj],
 		verifyPass:true
-	} 
+	}
+	console.log(param)
 	innerVerify(param).then(res => { 
 		console.log(res)
+		if(res.code==200){
+			uni.showToast({ title: '验证成功', icon: 'none' })
+			uni.navigateBack({
+				delta: 1 // 返回到已存在的页面
+			});
+		}else{
+			uni.showToast({ title: res.msg, icon: 'none' })
+		}
+		
 	}).catch(error => {
 		console.log(error) 
 	})  

src/pages/new-purchase/accept/index.vue

@@ -83,21 +83,19 @@ const active = ref(1)
 const tableList = ref([])
 const statusList = ref(['3', '13', '4', '14', '19'])
 
-const getTableList = () => {
-    let obj = {
-        pageNum: '1',
-        pageSize: '10',
-        statusList: statusList.value,
-    }
-    console.log(obj)
-    getPurchaseList(obj)
-        .then((res) => {
-            tableList.value = res.rows
-            console.log(tableList.value)
-        })
-        .catch((error) => {
-            console.log(error)
-        })
+const getTableList = () => { 
+	let obj = {
+		"pageNum":"1",
+		"pageSize":"10",
+		"statusList":statusList.value,
+	}
+	console.log(obj)
+	getPurchaseList(obj).then(res => { 
+		tableList.value = res.data.rows;
+		console.log(tableList.value)
+	}).catch(error => {
+		console.log(error) 
+	})  
 }
 
 const changeTab = (index) => {