ljc 7 godzin temu
rodzic
commit
6f5bf2d1fd

+ 3 - 0
config/domainState.ts

@@ -43,5 +43,8 @@ export function buildHostUrls() {
     Host87: `${ht}//followup.${ho}.${dt}`,
     Host05: `${ht}//file.${ho}.${dt}`,
     HostEnter: `${ht}//ad.${ho}.${dt}`,
+    // Host80:'http://192.168.0.23:8000',
+    // Host04: `http://192.168.0.23:8004`,
+    // Host90: `http://192.168.0.23:9000`,
   }
 }

+ 5 - 48
pages/ib/reportTrade.vue

@@ -175,8 +175,7 @@
         return
       }
 
-      const type = reportType.value
-      const detailType = search.detail_type
+      const type = detailType.value
 
       // 根据不同的列 prop 进行合计数据显示和格式化
       const prop = column.prop
@@ -185,60 +184,18 @@
         return
       }
 
-      if (type == 1) {
-        if (['deposit', 'withdrawal', 'credit'].includes(prop)) {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
-      } else if (type == 2) {
-        if (['volume', 'rebateAmount', 'commissionAmount'].includes(prop)) {
+      if (type == 4) {
+        if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
           sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
         } else {
           sums[index] = ''
         }
-      } else if (type == 3) {
-        if (detailType == 4) {
-          if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
-            sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-          } else {
-            sums[index] = ''
-          }
-        } else {
-          if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
-            sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-          } else {
-            sums[index] = ''
-          }
-        }
-      } else if (type == 4) {
-        if (['credit', 'balance', 'equity', 'floating'].includes(prop)) {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
-      } else if (type == 6) {
-        if (prop === 'amount') {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
-      } else if (type == 7) {
-        if (['fxVolume', 'cfdVolume', 'indexVolume', 'metalVolume'].includes(prop)) {
+      } else {
+        if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
           sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
         } else {
           sums[index] = ''
         }
-      } else if (type == 24) {
-        if (prop === 'volume') {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) + ' /手' : '0'
-        } else if (prop === 'rebate') {
-          sums[index] = summaryData[prop] ? '$' + numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
-      } else {
-        sums[index] = ''
       }
     })
 

+ 24 - 1
uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -55,7 +55,7 @@
 			</view>
 
 			<view v-else class="uni-date-range--x" :style="pickerPositionStyle">
-				<view class="uni-popper__arrow"></view>
+				<view class="uni-popper__arrow" :style="arrowPositionStyle"></view>
 				<view v-if="hasTime" class="popup-x-header uni-date-changed">
 					<view class="popup-x-header--datetime">
 						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
@@ -200,6 +200,7 @@ export default {
 			},
 			pickerVisible: false,
 			pickerPositionStyle: null,
+      arrowPositionStyle: null,
 			isEmitValue: false,
 			isPhone: false,
 			isFirstShow: true,
@@ -468,6 +469,23 @@ export default {
 		platform() {
 			if (typeof navigator !== "undefined") {
 				this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
+        let windowWidth = 0;
+        // #ifdef H5
+
+        if (typeof window !== 'undefined') {
+          windowWidth = window.innerWidth
+        }
+        // #endif
+
+        // #ifdef APP-PLUS
+        // @ts-ignore
+        if (typeof uni !== 'undefined' && uni.getSystemInfoSync) {
+          // @ts-ignore
+          const systemInfo = uni.getSystemInfoSync()
+          windowWidth = systemInfo.windowWidth
+        }
+        // #endif
+        this.windowWidth = windowWidth
 				return
 			}
 			// #ifdef MP-WEIXIN
@@ -480,6 +498,7 @@ export default {
 				windowWidth
 			} = uni.getSystemInfoSync()
 			// #endif
+      console.log(windowWidth,'windowWidth')
 			this.isPhone = windowWidth <= 500
 			this.windowWidth = windowWidth
 		},
@@ -502,6 +521,10 @@ export default {
 			dateEditor.boundingClientRect(rect => {
 				if (this.windowWidth - rect.left < this.datePopupWidth) {
 					this.pickerPositionStyle.right = 0
+          this.arrowPositionStyle = {
+            right: '10%',
+            left: 'initial',
+          }
 				}
 			}).exec()
 			setTimeout(() => {