Merge remote-tracking branch 'refs/remotes/origin/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

.env.js

@@ -1,53 +1,53 @@
-// let version = __wxConfig.envVersion;
+let version = __wxConfig.envVersion;
 
-// console.log('配置文件加载')
-// // #ifdef MP-WEIXIN
-// console.log('微信小程序验证')
-// console.log(__wxConfig.envVersion)
-// if (version === 'develop') {
-//     //开发环境
-//     ENV_CONFIG = require('.env.dev.js');
-//     ENV_CONFIG.isCanvas2d = false
-// }else if (__wxConfig.envVersion === 'release') {
-//     //生产环境
-//     ENV_CONFIG = require('.env.prod.js');
-//     ENV_CONFIG.isCanvas2d = true
-// }  else {
-//     //体验环境
-//     ENV_CONFIG = require('.env.prod.js');
-//     ENV_CONFIG.isCanvas2d = true
-// }
-// //#endif
-// // #ifndef MP-WEIXIN
-// console.log('其它环境验证')
-// if (version === 'develop') {
-//     //开发环境
-//     // ENV_CONFIG = require('.env.dev.js');
-//     ENV_CONFIG = require('.env.trial.js');
-//     ENV_CONFIG.isCanvas2d = false
-//     // ENV_CONFIG = require('.env.prod.js');
-// }else if(version === 'trial'){
-//     //体验环境
-//     ENV_CONFIG = require('.env.trial.js');
-//     ENV_CONFIG.isCanvas2d = true
-// } else{
+console.log('配置文件加载')
+// #ifdef MP-WEIXIN
+console.log('微信小程序验证')
+console.log(__wxConfig.envVersion)
+if (version === 'develop') {
+    //开发环境
+    ENV_CONFIG = require('.env.dev.js');
+    ENV_CONFIG.isCanvas2d = false
+}else if (__wxConfig.envVersion === 'release') {
+    //生产环境
+    ENV_CONFIG = require('.env.prod.js');
+    ENV_CONFIG.isCanvas2d = true
+}  else {
+    //体验环境
+    ENV_CONFIG = require('.env.prod.js');
+    ENV_CONFIG.isCanvas2d = true
+}
+//#endif
+// #ifndef MP-WEIXIN
+console.log('其它环境验证')
+if (version === 'develop') {
+    //开发环境
+    // ENV_CONFIG = require('.env.dev.js');
+    ENV_CONFIG = require('.env.trial.js');
+    ENV_CONFIG.isCanvas2d = false
+    // ENV_CONFIG = require('.env.prod.js');
+}else if(version === 'trial'){
+    //体验环境
+    ENV_CONFIG = require('.env.trial.js');
+    ENV_CONFIG.isCanvas2d = true
+} else{
 
-//     //生产环境
-//     ENV_CONFIG = require('.env.prod.js');
-//     ENV_CONFIG.isCanvas2d = true
-// }
-// //#endif
-// // #ifdef MP-WEIXIN
-// //给环境变量process.uniEnv赋值
-// if (ENV_CONFIG !== null) {
-//     process.uniEnv = {};
-//     for (let key in ENV_CONFIG) {
-//         process.uniEnv[key] = ENV_CONFIG[key];
-//     }
-//     // #ifdef H5
-//     if (nodeEnv !== 'development') {
-//         process.uniEnv.baseUrl = window.location.hostname;
-//     }
-//     //#endif
-// }
-// //#endif
+    //生产环境
+    ENV_CONFIG = require('.env.prod.js');
+    ENV_CONFIG.isCanvas2d = true
+}
+//#endif
+// #ifdef MP-WEIXIN
+//给环境变量process.uniEnv赋值
+if (ENV_CONFIG !== null) {
+    process.uniEnv = {};
+    for (let key in ENV_CONFIG) {
+        process.uniEnv[key] = ENV_CONFIG[key];
+    }
+    // #ifdef H5
+    if (nodeEnv !== 'development') {
+        process.uniEnv.baseUrl = window.location.hostname;
+    }
+    //#endif
+}
+//#endif

components/en-utils/en-nav/en-nav.vue

@@ -16,6 +16,7 @@
 			</view>
 		</view>
 		<view :style="[{height:is_fixed? `${60+bgHeight}px`:`${60+fixedHeight}px`}]">
+      {{fixedHeight}}{{bgHeight}}
 		</view>
 		<!-- 带背景插槽 start-->
 		<slot></slot>
@@ -206,4 +207,4 @@
 	.nav-bg2 {
 		background-image: url("https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-bg.png?imageMogr2/quality/20");
 	}
-</style>
+</style>

page_task/task_details/module/entities.vue

@@ -0,0 +1,228 @@
+<template>
+	<view class="m-20">
+    <view class="title-box p-b20">
+      <view class="size-32 sys-weight-600">债务</view>
+      <view class="size-20 title-num">{{stageList.length}}</view>
+    </view>
+    <view class="row-c r-20 sys-background-fff m-b20" v-for="(item,index) in stageList" :key="index">
+      <view class="file-box r-20">
+        <view class="file-data">
+          <view class="file-icon" style="background-color:#FC526A " >
+            <uni-icons type="calendar" color="#fff" size="20"></uni-icons>
+          </view>
+          <view>
+            <view class="attachment-text">{{item.attachmentName}}</view>
+            <view class="size-26 text-color-333 m-t20"><text class="text-icon">活跃</text><text>￥116,5710</text></view>
+          </view>
+        </view>
+        <view>
+          <uni-icons type="right" size="20"></uni-icons>
+        </view>
+
+      </view>
+    </view>
+
+    <view class="title-box p-b20">
+      <view class="size-32 sys-weight-600">借款人</view>
+      <view class="size-20 title-num">{{oneList.length}}</view>
+    </view>
+    <view class="row-c r-20 sys-background-fff m-b20" v-for="(item,index) in oneList" :key="index">
+      <view class="file-box r-20">
+        <view class="file-data">
+          <view class="file-icon" style="background-color:#9335FF " >
+            <uni-icons type="calendar" color="#fff" size="20"></uni-icons>
+          </view>
+          <view>
+            <view class="attachment-text">{{item.attachmentName}}</view>
+            <view class="size-26 text-color-333 m-t20"><text class="text-icon">活跃</text></view>
+          </view>
+        </view>
+        <view>
+          <uni-icons type="right" size="20"></uni-icons>
+        </view>
+
+      </view>
+    </view>
+
+    <view class="title-box p-b20">
+      <view class="size-32 sys-weight-600">担保人</view>
+      <view class="size-20 title-num">{{twoList.length}}</view>
+    </view>
+    <view class="row-c r-20 sys-background-fff m-b20" v-for="(item,index) in twoList" :key="index">
+      <view class="file-box r-20">
+        <view class="file-data">
+          <view class="file-icon" style="background-color:#009BF2 " >
+            <uni-icons type="calendar" color="#fff" size="20"></uni-icons>
+          </view>
+          <view>
+            <view class="attachment-text">{{item.attachmentName}}</view>
+            <view class="size-26 text-color-333 m-t20"><text class="text-icon">活跃</text></view>
+          </view>
+        </view>
+        <view>
+          <uni-icons type="right" size="20"></uni-icons>
+        </view>
+
+      </view>
+    </view>
+
+    <view class="title-box p-b20">
+      <view class="size-32 sys-weight-600">抵押物</view>
+      <view class="size-20 title-num">{{threeList.length}}</view>
+    </view>
+    <view class="row-c r-20 sys-background-fff m-b20" v-for="(item,index) in threeList" :key="index">
+      <view class="file-box r-20">
+        <view class="file-data">
+          <view class="file-icon" style="background-color:#00B05E " >
+            <uni-icons type="calendar" color="#fff" size="20"></uni-icons>
+          </view>
+          <view>
+            <view class="attachment-text">{{item.attachmentName}}</view>
+            <view class="size-26 text-color-333 m-t20"><text class="text-icon">活跃</text></view>
+          </view>
+        </view>
+        <view>
+          <uni-icons type="right" size="20"></uni-icons>
+        </view>
+
+      </view>
+    </view>
+
+    <view class="title-box p-b20">
+      <view class="size-32 sys-weight-600">债权人</view>
+      <view class="size-20 title-num">{{fourList.length}}</view>
+    </view>
+    <view class="row-c r-20 sys-background-fff m-b20" v-for="(item,index) in fourList" :key="index">
+      <view class="file-box r-20">
+        <view class="file-data">
+          <view class="file-icon" style="background-color:#FF7E00 " >
+            <uni-icons type="calendar" color="#fff" size="20"></uni-icons>
+          </view>
+          <view>
+            <view class="attachment-text">{{item.attachmentName}}</view>
+            <view class="size-26 text-color-333 m-t20"><text class="text-icon">活跃</text></view>
+          </view>
+        </view>
+        <view>
+          <uni-icons type="right" size="20"></uni-icons>
+        </view>
+
+      </view>
+    </view>
+
+
+	</view>
+</template>
+
+<script>
+
+  export default {
+    name:'entities',
+		props: {
+      businessId:{
+        default:0
+      }
+		},
+		data() {
+			return {
+        stageList: [],
+        oneList: [],
+        twoList: [],
+        threeList: [],
+        fourList: [],
+			}
+		},
+    watch:{
+      'businessId':function () {
+        // this.getStageList()
+      }
+    },
+    mounted() {
+      this.getStageList()
+    },
+    methods: {
+      getStageList() {
+        this.stageList=[{'attachmentName':'大连迈世未履行（2024）辽0211民初2861号民事判决书','attachmentFormat':'docx','attachmentSize':1165710},]
+        this.oneList=[{'attachmentName':'大连迈世农业发展有限公司','attachmentFormat':'docx','attachmentSize':1165710},]
+        this.twoList=[{'attachmentName':'迈世集团有限公司','attachmentFormat':'docx','attachmentSize':1165710},]
+        this.fourList=[{'attachmentName':'迈世集团有限公司','attachmentFormat':'docx','attachmentSize':1165710},]
+        this.threeList=[{'attachmentName':'中信银行股份有限公司大连分行','attachmentFormat':'docx','attachmentSize':1165710},{'attachmentName':'景山东园7号13层2号房屋','attachmentFormat':'docx','attachmentSize':1165710},]
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  .title-box{
+    display:  flex;
+    justify-content: space-between;
+    align-items: center;
+    .title-num{
+      color: #ee9393;
+      background-color: #f6e8c4;
+      padding: 4rpx 16rpx;
+      border-radius: 12rpx;
+    }
+  }
+  .file-box{
+    box-shadow: 0 2rpx 6rpx 0  #0000001a, 0 2rpx 2px -2rpx  #0000001a;
+    width: 100%;
+    padding: 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .file-data{
+      display: flex;
+      justify-content: flex-start;
+      .attachment-text{
+        width: 410rpx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      .file-icon{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 96rpx;
+        height: 96rpx;
+        border-radius: 20rpx;
+        margin-right: 32rpx;
+        background-color: #FA4C78;
+      }
+      .text-icon{
+        padding: 4rpx 8rpx;
+        background-color: #DBFCE7;
+        color: #008236;
+        font-weight: 400;
+        font-size: 24rpx;
+        margin-right: 10rpx;
+      }
+      .file-icon-pdf{
+        background-color: #9033FF;
+      }
+      .file-icon-excel{
+        background-color:#00A5EC;
+      }
+      .file-icon-excel{
+        background-color:#00A762;
+      }
+      .file-icon-excel{
+        background-color:#FF7F00;
+      }
+      .file-icon-excel{
+        background-color:#8440FD;
+      }
+    }
+  }
+	.steps-item:last-child {
+		margin-bottom: 0;
+	}
+
+	.steps-line {
+		width: 2rpx;
+		background-color: #D9D9D9;
+		height: 90rpx;
+	}
+
+</style>

page_task/task_details/module/graph.vue

@@ -57,14 +57,15 @@
 <!--      </view>-->
 <!--    </view>-->
 
+
     <!-- 统计信息 -->
     <view class="stats-panel">
-      <view class="stats-box"> <view class="stats-icon-g stats-icon"></view>  <text class="stat-item">资产</text></view>
-      <view class="stats-box"> <view class="stats-icon-g stats-icon"></view>  <text class="stat-item">资产</text></view>
-      <view class="stats-box"> <view class="stats-icon-g stats-icon"></view>  <text class="stat-item">资产</text></view>
-      <view class="stats-box"> <view class="stats-icon-g stats-icon"></view>  <text class="stat-item">资产</text></view>
-      <view class="stats-box"> <view class="stats-icon-g stats-icon"></view>  <text class="stat-item">资产</text></view>
-      <view class="stats-box"> <view class="stats-icon-g stats-icon"></view>  <text class="stat-item">资产</text></view>
+      <view class="stats-box"> <view class="stats-icon-debt stats-icon"></view>  <text class="stat-item">债务</text></view>
+      <view class="stats-box"> <view class="stats-icon-borrower stats-icon"></view>  <text class="stat-item">借款人</text></view>
+      <view class="stats-box"> <view class="stats-icon-guarantor stats-icon"></view>  <text class="stat-item">担保人</text></view>
+      <view class="stats-box"> <view class="stats-icon-collateral stats-icon"></view>  <text class="stat-item">抵押物</text></view>
+<!--      <view class="stats-box"> <view class="stats-icon-company stats-icon"></view>  <text class="stat-item">借款人</text></view>-->
+<!--      <view class="stats-box"> <view class="stats-icon-g stats-icon"></view>  <text class="stat-item">法院</text></view>-->
     </view>
   </view>
 </template>
@@ -118,19 +119,21 @@ export default {
       // 示例数据
       this.graphData = {
         nodes: [
-          { id: 'node1', name: '中心节点', type: 'center', x: 275, y: 150, size: 20, color: '#ff6b6b' },
-          { id: 'node2', name: '用户节点', type: 'user', x: 275, y: 150, size: 15, color: '#4ecdc4' },
-          { id: 'node3', name: '产品节点', type: 'product', x: 275, y: 150, size: 15, color: '#45b7d1' },
-          { id: 'node4', name: '分类节点', type: 'category', x: 275, y: 150, size: 15, color: '#96ceb4' },
-          { id: 'node5', name: '服务节点', type: 'service', x: 275, y: 150, size: 15, color: '#feca57' }
+          { id: 'node1', name: '债务', type: 'center', x: 275, y: 150, size: 20, color: '#ff6b35' },
+          { id: 'node2', name: '大连迈世农业发展有限公司', type: 'user', x: 275, y: 150, size: 15, color: '#8b5cf6' },
+          { id: 'node3', name: '迈世集团有限公司', type: 'product', x: 275, y: 150, size: 15, color: '#3b82f6' },
+          { id: 'node4', name: '宜居园81号2单元1层1号房屋', type: 'category', x: 275, y: 150, size: 15, color: '#10b981' },
+          { id: 'node6', name: '景山东园7号13层2号房屋', type: 'category', x: 275, y: 150, size: 15, color: '#10b981' },
+          { id: 'node5', name: '中信银行股份有限公司大连分行', type: 'service', x: 275, y: 150, size: 15, color: '#6366f1' }
         ],
         links: [
           { source: 'node1', target: 'node2' },
           { source: 'node1', target: 'node3' },
           { source: 'node1', target: 'node4' },
           { source: 'node1', target: 'node5' },
-          { source: 'node2', target: 'node3' },
-          { source: 'node4', target: 'node5' }
+          { source: 'node1', target: 'node6' },
+          { source: 'node2', target: 'node4' },
+          { source: 'node3', target: 'node6' },
         ]
       };
     },
@@ -139,7 +142,7 @@ export default {
       const animate = () => {
         this.updateLayout();
         this.drawGraph();
-        this.animationId = requestAnimationFrame(animate);
+        // this.animationId = requestAnimationFrame(animate);
       };
       animate();
     },
@@ -337,10 +340,10 @@ export default {
       // 检测点击的节点
       const touchX = e.touches[0].x / this.scale;
       const touchY = e.touches[0].y / this.scale;
-
       this.selectedNode = this.getNodeAtPosition(touchX, touchY);
       if (this.selectedNode) {
-        uni.vibrateShort(); // 触觉反馈
+        this.$emit('setNode',this.selectedNode)
+        // uni.vibrateShort(); // 触觉反馈
       }
     },
 
@@ -450,7 +453,7 @@ export default {
 .graph-container {
   display: flex;
   flex-direction: column;
-  height: calc(100vh - 225px);
+  height: calc(100vh - 295px);
   background: #f5f5f5;
   margin: 0 20rpx ;
   border-radius: 50rpx;
@@ -599,12 +602,33 @@ export default {
   width: 10rpx;
   height: 10rpx;
   margin-right: 8rpx;
+  background-color:#6b7280 ;
+}
+.stats-icon-debt{
+  background-color:#ff6b35 ;
+}
+
+.stats-icon-borrower{
+  background-color:#8b5cf6 ;
+}
+
+.stats-icon-guarantor{
+  background-color:#3b82f6 ;
+}
+
+.stats-icon-collateral{
+  background-color:#10b981 ;
 }
-.stats-icon-g{
-  background-color:#4ecdc4 ;
+
+.stats-icon-property{
+  background-color:#f59e0b ;
 }
 
 
+.stats-icon-company{
+  background-color:#6366f1 ;
+}
+
 .stat-item {
   display: block;
   color: white;

page_task/task_details/module/word.vue

@@ -1,7 +1,8 @@
 <template>
-	<view class="m-20">
+  <view class="m-20">
+
     <view class="row-c r-20 sys-background-fff m-b20" v-for="(item,index) in stageList" :key="index">
-      <view class="file-box">
+      <view class="file-box r-20">
         <view class="file-data">
           <view class="file-icon" v-if="item.attachmentFormat==='docx'">
             <image class="wh-45 " src="/page_task/static/img/task-details/icon-word.png" mode="aspectFill"></image>
@@ -17,86 +18,86 @@
             <view class="size-26 text-color-333 m-t10"><text>{{item.attachmentFormat}}</text>•<text>{{(item.attachmentSize/1024/1024).toFixed(2)}}MB</text></view>
           </view>
         </view>
-
-
         <view>
           <uni-icons type="right" size="20"></uni-icons>
         </view>
 
       </view>
     </view>
-	</view>
+  </view>
 </template>
 
 <script>
 
-  export default {
-    name:'word-list',
-		props: {
-      businessId:{
-        default:0
-      }
-		},
-		data() {
-			return {
-        stageList: []
-			}
-		},
-    watch:{
-      'businessId':function () {
-        // this.getStageList()
-      }
-    },
-    mounted() {
-      this.getStageList()
-    },
-    methods: {
-      getStageList() {
-        this.stageList=[
-          {'attachmentName':'拍卖裁定书.docx','attachmentFormat':'docx','attachmentSize':465445,'attachmentAddress':'https://storage.jd.com/auction.gateway/5EB379EF1ADA205F9525D1BFA9DC1D4D20250616121557808.docx'},
-          {'attachmentName':'通知书（定向询价）.pdf','attachmentFormat':'pdf','attachmentSize':284577,'attachmentAddress':'https://storage.jd.com/auction.gateway/2CC6F971D5CA2A11B829D01956446F3920250418151753793.pdf'},
-          {'attachmentName':'评估报告1.pdf','attachmentFormat':'pdf','attachmentSize':3276836,'attachmentAddress':'https://storage.jd.com/auction.gateway/7F7226679C6E76620D9381906217543920250612120816112.pdf'},
-        ]
-      },
+export default {
+  name:'entities',
+  props: {
+    businessId:{
+      default:0
+    }
+  },
+  data() {
+    return {
+      stageList: []
+    }
+  },
+  watch:{
+    'businessId':function () {
+      // this.getStageList()
+    }
+  },
+  mounted() {
+    this.getStageList()
+  },
+  methods: {
+    getStageList() {
+      this.stageList=[
+        {'attachmentName':'拍卖裁定书.docx','attachmentFormat':'docx','attachmentSize':465445,'attachmentAddress':'https://storage.jd.com/auction.gateway/5EB379EF1ADA205F9525D1BFA9DC1D4D20250616121557808.docx'},
+        {'attachmentName':'通知书（定向询价）.pdf','attachmentFormat':'pdf','attachmentSize':284577,'attachmentAddress':'https://storage.jd.com/auction.gateway/2CC6F971D5CA2A11B829D01956446F3920250418151753793.pdf'},
+        {'attachmentName':'评估报告1.pdf','attachmentFormat':'pdf','attachmentSize':3276836,'attachmentAddress':'https://storage.jd.com/auction.gateway/7F7226679C6E76620D9381906217543920250612120816112.pdf'},
+      ]
     },
-  }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .file-box{
-    width: 100%;
-    padding: 32rpx;
+.file-box{
+  box-shadow: 0 2rpx 6rpx 0  #0000001a, 0 2rpx 2px -2rpx  #0000001a;
+  width: 100%;
+  padding: 32rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .file-data{
     display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .file-data{
+    justify-content: flex-start;
+    .file-icon{
       display: flex;
-      justify-content: flex-start;
-      .file-icon{
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 96rpx;
-        height: 96rpx;
-        border-radius: 20rpx;
-        background-color:oklch(.97 .014 254.604);
-        margin-right: 32rpx;
-      }
-      .file-icon-pdf{
-        background-color: oklch(.971 .013 17.38);
-      }
-      .file-icon-excel{
-        background-color: oklch(.982 .018 155.826);
-      }
+      justify-content: center;
+      align-items: center;
+      width: 96rpx;
+      height: 96rpx;
+      border-radius: 20rpx;
+      background-color:#f8f9ff;
+      margin-right: 32rpx;
+    }
+    .file-icon-pdf{
+      background-color: #fff8f8;
+    }
+    .file-icon-excel{
+      background-color:#f6fffb;
     }
   }
-	.steps-item:last-child {
-		margin-bottom: 0;
-	}
+}
+.steps-item:last-child {
+  margin-bottom: 0;
+}
+
+.steps-line {
+  width: 2rpx;
+  background-color: #D9D9D9;
+  height: 90rpx;
+}
 
-	.steps-line {
-		width: 2rpx;
-		background-color: #D9D9D9;
-		height: 90rpx;
-	}
 </style>

page_task/task_details/task_details.vue

@@ -38,12 +38,17 @@
     </Nav>
     <view class="sys-list-background-color task-tabs-width ">
         <view v-if="current === 1"></view>
-        <view v-else-if="current ===2"></view>
-        <view v-else-if="current ===3"></view>
+        <view v-else-if="current ===2">
+          <graph @setNode="setNode"></graph>
+        </view>
+        <view v-else-if="current ===3">
+
+        </view>
         <view v-else>
           <word></word>
         </view>
-        <graph></graph>
+      <entities></entities>
+
     </view>
 
 
@@ -74,9 +79,11 @@ import tools from "@/service/tools";
 import EnSelect from "@/components/en-utils/en-select/en-select.vue";
 import CreditList from "@/page_task/credit/credit.vue";
 import Graph from "@/page_task/task_details/module/graph.vue";
+import Entities from "@/page_task/task_details/module/entities.vue";
 
 export default {
   components: {
+    Entities,
     Graph,
     CreditList,
     EnSelect,
@@ -91,7 +98,7 @@ export default {
   data() {
     return {
       current: 1,
-      fixedHeight: 150,
+      fixedHeight: 220,
       options: {
         // autoHeight: true,
         slidesPerView: 1.1,
@@ -164,13 +171,19 @@ export default {
     }
   },
   onLoad(data) {
-    console.log('-----------aaaaa-----------')
+    // #ifdef H5
+      this.fixedHeight=150
+    //#endif
 
   },
   mounted() {
 
   },
   methods: {
+    setNode(node){
+      console.log("----------事件回调----------")
+      console.log(node)
+    },
     makingCall(phone){
       tools.makingCall(phone)
     },

static/css/common.css

@@ -422,13 +422,9 @@
 
 .m-t6 {
 	max-width: 50%;
-	/* 最大宽度 */
 	overflow: hidden;
-	/* 超出隐藏 */
 	text-overflow: ellipsis;
-	/* 显示省略号 */
 	white-space: nowrap;
-	/* 不换行 */
 }
 
 /*margin大小*/
@@ -1230,4 +1226,4 @@
 
 .mr-40 {
 	margin-right: 40rpx;
-}
+}