样式优化

lttnew
Showing 11 changed files with 59 additions and 22 deletions
common/mystyle.scss
group/apply/applyList.vue
group/apply/mergeUpDetail.vue
group/auditRecord1.vue
group/groupOrderDetail.vue
level/ztx/memberAudit.vue
myCenter/transferPay.vue
pages.json
pages/index/home.vue
pages/index/msgList.vue
personalVip/paymentDetail.vue
--- a/common/mystyle.scss
View file @0d5a6da
+++ b/common/mystyle.scss
View file @0d5a6da
@@ -27,6 +27,7 @@ page {
 .mt10{margin-top: 10rpx !important;}
 .ml10{margin-left: 10rpx !important;}
 .mt20{margin-top: 20px !important;}
+.p020{padding: 0 20rpx !important;}
 .must{color: #AD181F;font-size: 24rpx;}
 .vipData .w50{width: 45%;}
 .esp{text-overflow: ellipsis;overflow: hidden;white-space: nowrap;margin-top: 16rpx;}
--- a/group/apply/applyList.vue
View file @0d5a6da
+++ b/group/apply/applyList.vue
View file @0d5a6da
@@ -42,7 +42,7 @@
          <view>
            政策优惠
            <view>
-              <text class="text-danger"> {{ item.discount ? item.discount : '--' }}</text>
+              <text class="text-danger"> {{ item.discount ? '¥' + (Number(item.discount) || 0).toFixed(2) : '--' }}</text>
            </view>
          </view>
          <view>
--- a/group/apply/mergeUpDetail.vue
View file @0d5a6da
+++ b/group/apply/mergeUpDetail.vue
View file @0d5a6da
@@ -21,7 +21,7 @@
        </view>
        <view class="w50">
          政策优惠：
-          <text>{{ form?.discount }}元</text>
+          <text>{{ form?.discount ? '¥' + (Number(form?.discount) || 0).toFixed(2) : '--' }}元</text>
        </view> 
        <view class="w50">
          付款费用：
--- a/group/auditRecord1.vue
View file @0d5a6da
+++ b/group/auditRecord1.vue
View file @0d5a6da
@@ -77,7 +77,7 @@
 						<view class="price-section">
 							<view class="price-row">
 								<text class="price-label">政策优惠</text>
-								<text class="price-value">{{ item.discount || '--' }}</text>
+								<text class="price-value">{{ item.discount ? '¥' + (Number(item.discount) || 0).toFixed(2) : '--' }}</text>
 							</view>
 							<view class="price-row">
 								<text class="price-label">付款费用</text>
--- a/group/groupOrderDetail.vue
View file @0d5a6da
+++ b/group/groupOrderDetail.vue
View file @0d5a6da
@@ -33,7 +33,7 @@
        <view class="fee-row">
          <view class="fee-item">
            <text class="fee-label">政策优惠：</text>
-            <text class="fee-value text-red">¥{{ (Number(orderInfo.discount) || 0).toFixed(2) }}</text>
+            <text class="fee-value text-red">{{ orderInfo.discount ? '¥' + (Number(orderInfo.discount) || 0).toFixed(2) : '--' }}</text>
          </view>
          <view class="fee-item">
            <text class="fee-label">付款费用：</text>
--- a/level/ztx/memberAudit.vue
View file @0d5a6da
+++ b/level/ztx/memberAudit.vue
View file @0d5a6da
@@ -44,7 +44,7 @@
          <view>
            政策优惠
            <view>
-              <text class="text-danger"> {{ item.discount ? item.discount : '--' }}</text>
+              <text class="text-danger"> {{ item.discount ? '¥' + (Number(item.discount) || 0).toFixed(2) : '--' }}</text>
            </view> 
          </view>
          <view>
--- a/myCenter/transferPay.vue
View file @0d5a6da
+++ b/myCenter/transferPay.vue
View file @0d5a6da
@@ -27,22 +27,22 @@
      <view class="bank-row">
        <text class="bank-label">收款人姓名</text>
        <text class="bank-value">秦琦五洋赫公司</text>
-        <text class="copy-btn" @click="handelCoPy('秦琦五洋赫公司')">复制</text>
+        <!-- <view class="copy-btn" @tap.stop="handleCopy('秦琦五洋赫公司')">复制</view> -->
      </view>
      <view class="bank-row">
        <text class="bank-label">收款银行</text>
        <text class="bank-value">中国民生银行</text>
-        <text class="copy-btn" @click="handelCoPy('中国民生银行')">复制</text>
+        <!-- <view class="copy-btn" @tap.stop="handleCopy('中国民生银行')">复制</view> -->
      </view>
      <view class="bank-row">
        <text class="bank-label">收款卡号</text>
        <text class="bank-value card-number">{{ form.ziZhangBu || '-' }}</text>
-        <text class="copy-btn" @click="handelCoPy(form.ziZhangBu)">复制</text>
+        <!-- <view class="copy-btn" @tap.stop="handleCopy(form.ziZhangBu)">复制</view> -->
      </view>
      <view class="bank-row">
        <text class="bank-label">收款金额</text>
        <text class="bank-value highlight">￥{{ form.price || '0.00' }}</text>
-        <text class="copy-btn" @click="handelCoPy(form.price)">复制</text>
+        <!-- <view class="copy-btn" @tap.stop="handleCopy(form.price)">复制</view> -->
      </view>
    </view>
@@ -105,20 +105,55 @@ async function getOrderDetail() {
  }
 }
-function handelCoPy(text) {
+function requestPrivacyAuthorize() {
-    if (!text || text === '-') {
+  return new Promise((resolve, reject) => {
-    uni.showToast({ title: '暂无内容可复制', icon: 'none' })
+    // #ifdef MP-WEIXIN
+    if (typeof wx !== 'undefined' && typeof wx.requirePrivacyAuthorize === 'function') {
+      wx.requirePrivacyAuthorize({
+        success: () => resolve(),
+        fail: (err) => reject(err)
+      })
      return
    }
+    // #endif
+    resolve()
+  })
+}
+function doCopy(value) {
+  return new Promise((resolve, reject) => {
    uni.setClipboardData({
-    data: String(text),
+      data: String(value),
      success: () => {
        uni.showToast({ title: '复制成功', icon: 'success' })
+        resolve()
      },
-    fail: () => {
+      fail: (err) => reject(err)
-      uni.showToast({ title: '复制失败', icon: 'none' })
+    })
+  })
+}
+async function handleCopy(text) {
+  const value = text === 0 ? '0' : (text ?? '')
+  if (value === '' || value === '-') {
+    uni.showToast({ title: '暂无内容可复制', icon: 'none' })
+    return
  }
+  try {
+    await requestPrivacyAuthorize()
+    await doCopy(value)
+  } catch (err) {
+    console.error('复制失败', err)
+    if (err && err.errno === 112) {
+      uni.showModal({
+        title: '复制失败',
+        content: '当前小程序未完成“剪贴板”隐私声明，请在微信公众平台更新用户隐私保护指引后重试。',
+        showCancel: false
      })
+      return
+    }
+    uni.showToast({ title: '复制失败', icon: 'none' })
+  }
 }
 function handelClose() {
--- a/pages.json
View file @0d5a6da
+++ b/pages.json
View file @0d5a6da
@@ -29,7 +29,7 @@
 		{
 			"path": "pages/index/msgList",
 			"style": {
-				"navigationBarTitleText": "待办列表",
+				"navigationBarTitleText": "通知公告",
 				"enablePullDownRefresh": false
 			}
 		},
--- a/pages/index/home.vue
View file @0d5a6da
+++ b/pages/index/home.vue
View file @0d5a6da
@@ -37,7 +37,7 @@
            <image :src="config.loginImage_api + '/fs/static/dg/icon05@3x.png'" class="btn-icon"></image>
            <text>考点申请</text>
          </view>
-          <view class="unit-btn" @click="goPath(`/myCenter/examPointApplyList?status=1}`)">
+          <view class="unit-btn" @click="goPath('/myCenter/examPointApplyList?status=1')">
            <image :src="config.loginImage_api + '/fs/static/dg/icon06@3x.png'" class="btn-icon"></image>
            <text>考点详情</text>
          </view>
--- a/pages/index/msgList.vue
View file @0d5a6da
+++ b/pages/index/msgList.vue
View file @0d5a6da
@@ -3,15 +3,15 @@
 		<z-paging ref="paging" v-model="dataList" @query="queryList" emptyViewImg="/static/nodata.png">
 			<!-- z-paging默认铺满全屏，此时页面所有view都应放在z-paging标签内，否则会被盖住 -->
 			<!-- 需要固定在页面顶部的view请通过slot="top"插入，包括自定义的导航栏 -->
-			<uni-section title="通知公告" padding>
+			<!-- <uni-section title="通知公告" padding> -->
-				<view class="msglist">
+				<view class="msglist mt20 p020">
 					<view class="msgitem" v-for="n in dataList" :key="n.id" @click="goDetail(n)">
 						<!-- <text class="dot" :class="{'done':n.readFlag=='1'}"></text> -->
 						<view class="tt esp">{{n.name}}</view>
 						<view class="date">{{ n.belongTime }}</view>
 					</view>
 				</view>
-			</uni-section>
+			<!-- </uni-section> -->
 		</z-paging>
 	</view>
 </template>
--- a/personalVip/paymentDetail.vue
View file @0d5a6da
+++ b/personalVip/paymentDetail.vue
View file @0d5a6da
@@ -25,17 +25,18 @@
    <view class="wBox">
      <!--      <view class="tt">{{ // form.paymentName  }}</view>-->
-      <view class="info">
+      <!-- <view class="info">
        <view>共
          <text>{{ list.length }}</text>
          人
        </view>
-      </view>
+      </view> -->
      <view class="userlist">
        <view v-for="(n,index) in list" :key="index" class="item">
          <view>
            <view class="name">{{ n.perName }}
              <text v-if="n.memberInfoName">({{ n.memberInfoName || '' }})</text>
+              <text v-if="n.perIdcCode">{{ n.perIdcCode || '' }}</text>
            </view>
            <view class="date">原有效期至 {{ n.originValidityDate ? n.originValidityDate.slice(0, 10) : '--' }}</view>
          </view>