接口联调

src/pages/business/editDaily.vue

@@ -72,20 +72,24 @@ onMounted(() => {
 // 查询列表
 let list = ref([]);
 let count = ref(0);
+let bizIds = ref([]);//常用服务列表
 let getList = async()=>{
     let arrNew = [];
+    bizIds.value = [];
     let res = await businessList({});//查询所有业务
     let arr = res || [];
 
     let res2 = await getUserFavorite({});//查询当前用户的常用服务
-    let bizIdListStr = res2.bizIdList || '';
+    let arr2 = res2 || [];
-    let arr2 = bizIdListStr.split(",");
     count.value = arr2.length;
+    arr2.forEach(item=>{
+        bizIds.value.push(item.bizId)
+    });
    
     arr.forEach(item=>{
         item.isDaily=false;
         arr2.forEach(item2=>{
-            if(item2==item.bizId){
+            if(item2.bizId==item.bizId){
                 item.isDaily=true;
             }
         })
@@ -97,7 +101,7 @@ let getList = async()=>{
         item.expandFlag = false;
     });
     list.value = bizList;
-    console.log("list=>",list.value)
+    // console.log("list=>",list.value)
 }
 
 // 下拉刷新
@@ -127,7 +131,7 @@ const downCallback = async (mescroll) => {
     }
 }
 
-let bizIds = ref([]);
+
 // 选择常用
 const handleCheck=(item)=>{
     item.isDaily = !item.isDaily;
@@ -136,13 +140,13 @@ const handleCheck=(item)=>{
         bizIds.value.push(item.bizId);
     }else{
         count.value--;
-        const index = bizIds.value.findIndex(item2 => item2.bizId === item.bizId);
+        const index = bizIds.value.findIndex(item2 => item2 == item.bizId);
         if (index !== -1) {
             bizIds.value.splice(index, 1);
         }
     }
 
-    console.log("bizIds=>",bizIds.value)
+    // console.log("handleCheck=>bizIds=>",bizIds.value)
 }
 
 // 提交
@@ -168,6 +172,7 @@ const handleSubmit= async()=>{
     width: 690rpx;
     margin-bottom:0;
     border-radius: 8px 8px 0 0;
+    min-height: calc(100vh - 100px);
 }
 
 :deep(.mescroll-upwarp){

src/pages/h5-webview/h5-webview.vue

@@ -16,7 +16,7 @@ let title = ref('');
 let wv;
 onLoad(async(opt) => {
     // console.log(opt)
-    url.value = 'http://www.baidu.com'//opt.url;
+    url.value = opt.url;
     title.value = opt.title;
    
 })

src/pages/home/home.vue

@@ -108,9 +108,9 @@
           <view class="white-bg" v-if="commonServiceList.length>0">
               <view class="w-b-title">常用服务</view>
               <view class="logo-list">
-                  <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index">
+                  <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index"  @click="handleJump(item.bizUrl)">
-                      <img :src="item.imgSrc" />
+                      <img :src="'static/images/business/'+item.icon+'.png'" />
-                      <text class="font-gray">{{ item.name }}</text>
+                      <text class="font-gray">{{ item.bizName }}</text>
                   </view>
                   <!-- <view  class="l-l-item" @click="handleAddCommonSercice">
                     <img :src="'static/images/business/icon-add.png'">
@@ -305,8 +305,14 @@ const getSalesTask = async ()=>{
 // 常用服务
 let commonServiceList = ref([]) 
 const getCommonServices = async ()=>{
-  let res = await getUserFavorite({});
+  let data = await getUserFavorite({});
-  commonServiceList.value = res.list || []
+  commonServiceList.value = data || []
+}
+// 跳转
+let handleJump=(url)=>{
+    if(url){
+        uni.navigateTo({ url })
+    }
 }
 
 // 添加常用服务

src/pages/loading/loading.vue

@@ -4,6 +4,14 @@
     <view class="version">Version {{ appVersion }}</view>
     <!-- <view class="bottom-bg"></view> -->
 
+    <!-- 测试用 -->
+    <!-- #ifdef APP-PLUS -->
+    <button @click="saveValue">保存数据</button>
+    <button @click="getValue">加载数据</button>
+    <view>{{content}}--{{ app_device_id }}</view>
+    <!-- #endif -->
+    
+    
     <!-- 检查版本弹窗 -->
     <view class="version-con" v-if="versionVisible">
         <view class="v-bg">
@@ -27,6 +35,13 @@ import { formatIOS } from '@/utils/status.js'
 import { useUserStore } from '@/stores/user';
 const userStore = useUserStore();
 
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+let safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
+let app_device_id = ref("7f47cfb4-59e2-4cb9-ac46-9da5e23c4de2");
+let content = ref('')
+// #endif
+
 let appVersion = ref("1.0.0");//当前版本号
 let newVersion = ref('1.0.0');//最新版本号
 let versionVisible=ref(false);//版本弹窗
@@ -67,6 +82,57 @@ onLoad(async(opt) => {
 
 });
 
+// 保存设备ID
+const saveValue = ()=>{
+    console.log("saveValue",safeSave)
+    safeSave.saveSafeFile({
+        "key": "app_device_id",
+        "value": app_device_id.value
+    }, (res) => {
+        console.log(res);
+        if (res.code == 1) {
+            uni.showModal({
+                title: "保存成功",
+                content:res.msg,
+                success: function (res) {
+                    if (res.confirm) {
+                       content.value("成功=>")
+                    } 
+                }
+            })
+        } else {
+            uni.showModal({
+                title: "保存失败",
+                content:res.msg,
+            })
+        }
+
+    })
+}
+
+//  读取设备ID
+const  getValue =()=>{
+    console.log(safeSave)
+    safeSave.getSafeFile({
+        "key": "app_device_id"
+    }, (res) => {
+        console.log(res);
+        if (res.code == 1) {
+            app_device_id.value = res.data;
+            content.value = "aaaa==>"
+            uni.showModal({
+                title: "读取成功",
+                content:res.data,
+            })
+        } else {
+            uni.showModal({
+                title: "读取失败",
+                content: res.msg,
+            })
+        }
+    })
+};
+
 // 检查版本是否是最新的
 let getOSVesion = async()=>{
     let systemInfo = uni.getSystemInfoSync();

src/pages/userinfo/userinfo.vue

@@ -109,6 +109,7 @@ const userStore = useUserStore()
 // 1.头部导航栏
 const navBarPaddingTop = ref(0);
 let appVersion = ref("1.0.0");//当前版本号
+let newVersion = ref("1.0.0");//新版本号
 let isCurrent = ref(undefined);//是否是当前版本 1-是 2-否
 let systemInfo = uni.getSystemInfoSync();
 onLoad(async(opt) => {
@@ -186,8 +187,6 @@ const getVersion = async ()=>{
         // #endif
         os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
     }
-    // 当前手机版本
-    appVersion.value = param.appVersion;
     let data = await versionCheck(param);
     isCurrent.value = data.isCurrent;
 }