ZaiZai 2 tahun lalu
induk
melakukan
246e328d46
4 mengubah file dengan 40 tambahan dan 9 penghapusan
  1. 4 2
      config/index.js
  2. 2 2
      manifest.json
  3. 3 1
      pages/image/view.vue
  4. 31 4
      pages/my/project.vue

+ 4 - 2
config/index.js

@@ -18,8 +18,10 @@ export default {
     },
     //正式环境
     baseApi: {
-        api: 'http://47.110.251.215:8090/', //请求地址
-        form: 'https://user.hcxxy.com/',    //表单地址
+        //api: 'http://47.110.251.215:8090/', //请求地址
+        //form: 'https://user.hcxxy.com/',    //表单地址
+        api: 'http://192.168.0.109:8090/',  //请求地址
+        form: 'http://192.168.0.109:5173/', //表单地址
         wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
     },
     //H5测试设置

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "泓创数字工程",
     "appid" : "__UNI__A0B807E",
     "description" : "",
-    "versionName" : "2.0.0",
-    "versionCode" : 200,
+    "versionName" : "2.0.1",
+    "versionCode" : 201,
     "transformPx" : false,
     "networkTimeout" : {
         "request" : 300000,

+ 3 - 1
pages/image/view.vue

@@ -38,7 +38,9 @@
                             <uni-icons type="checkbox" size="26" color="#9a9a9a" v-else/>
                         </view>
                         <view class="hc-flex">
-                            <video class="h-100 w-100 b-rounded" :src="items.imageUrl" :controls="false" :show-center-play-btn="false" v-if="items.type === 1"/>
+                            <view class="hc-flex-center h-100 w-100 b-rounded" un-border="1 solid gray-3" v-if="items.type === 1">
+                                <text class="i-ri-vidicon-line text-50 text-gray-4"/>
+                            </view>
                             <hc-img class="b-rounded" :src="items.imageUrl?.toString()?.split(',')[0]" width="50" height="50" v-if="items.type === 2"/>
                         </view>
                         <view class="relative flex-1 ml-3">

+ 31 - 4
pages/my/project.vue

@@ -40,6 +40,9 @@
                 <view class="popup-btn-bar">
                     <button type="primary" class="popup-btn c1" @click="setProjectClick">设置为默认项目</button>
                 </view>
+                <view class="popup-btn-bar">
+                    <button type="primary" class="popup-btn c2" @click="onlyEffectivelick">仅本次生效</button>
+                </view>
                 <view class="popup-btn-bar">
                     <button type="primary" class="popup-btn c3" @click="cancelPopup">关闭</button>
                 </view>
@@ -54,7 +57,7 @@ import {onLoad} from '@dcloudio/uni-app'
 import {useAppStore} from "@/store";
 import mainApi from "~api/user/project";
 import {errorToast, successToast} from "@/utils/tools";
-import {deepClone, getArrValue} from "js-fast-way";
+import {deepClone, getArrValue, getObjValue} from "js-fast-way";
 import {getProjectContract} from "@/store/user";
 
 //初始变量
@@ -88,9 +91,15 @@ const getProjectAndContract = async () => {
 }
 
 //合同段点击
-const contractClick = ({id: pid}, {id: cid}) => {
-    projectId.value = pid
-    contractId.value = cid
+const projectData = ref({})
+const contractData = ref({})
+const contractClick = (project, contract) => {
+    //设置数据
+    projectData.value = project
+    contractData.value = contract
+    //设置ID
+    projectId.value = project.id
+    contractId.value = contract.id
 }
 
 //设置项目
@@ -126,6 +135,24 @@ const setProjectClick = async () => {
     }
 }
 
+//仅本次生效
+const onlyEffectivelick = () => {
+    const pid = projectId.value, cid = contractId.value
+    if (!pid || !cid) {
+        cancelPopup()
+        errorToast('请先选择项目和合同段')
+        return
+    }
+    store.setProjectId(pid)
+    store.setContractId(cid)
+    store.setProjectInfo(projectData.value)
+    store.setContractInfo(contractData.value)
+    successToast('设置成功')
+    setTimeout(() => {
+        uni.navigateBack()
+    }, 1500)
+}
+
 //取消并关闭
 const cancelPopup = () => {
     popupRef.value?.close()