Merge branch 'master' of http://124.70.211.186:3000/zxh/YXGJ

cloud/businessCard/edit.vue

@@ -224,6 +224,7 @@ export default {
                     label: "印象标签",
                     isMust: false,//是否必填
                     marginTop: 10,
+                    maxlength:10,
                     placeholder: '请填写，最多十个字',
                     verify: [{
                         reg: '^.{1,10}$',

cloud/commodityAdjustment/detail.vue

@@ -28,9 +28,8 @@
                 </u-radio-group>
             </view>
             <AForm ref="form" :form="form" @isUncomplete="isUncomplete"></AForm>
-            <view style="height: 70px;" />
         </view>
-        
+        <view :style="{height: tovw(80)}" ></view>
         <view class="footer">
             <view class="add" :class="uncomplete ? 'forbidden' : ''" hover-class="navigator-hover"
                 @click="uncomplete || loading ? '' : submit()">
@@ -281,7 +280,6 @@ export default {
     padding: 5px 10px;
     z-index: 5;
     display: flex;
-    align-items: center;
     .add {
         display: flex;
         align-items: center;

cloud/contacts/list.vue

@@ -61,7 +61,8 @@ export default {
                 }
             }
             .right {
-                padding: 10px 10px 10px 20px;
+                padding: 10px 10px 10px 10px;
+                border-radius: 5px;
             }
         }
     }

cloud/feedback/detail.vue

@@ -12,11 +12,11 @@
             </view>
             <view class="file-box">
                 <block v-for="item in detail.attinfos" :key="item.attachmentid">
-                    <view v-if="item.fileType == 'image'" @click="viewImages(item.url)" class="item">
+                    <view v-if="item.fileType == 'image'" @click="viewImages(item)" class="item" hover-class="navigator-hover">
                         <u-image :src="item.url" :width="tovw(105)" :height="tovw(105)" :lazy-load="true"
                             radius="5"></u-image>
                     </view>
-                    <view v-else-if="item.fileType == 'video'" class="item">
+                    <view v-else-if="item.fileType == 'video'" class="item" hover-class="navigator-hover">
                         <video class="video" :style="{ width: tovw(105), height: tovw(105) }" :poster="item.subfiles[0].url"
                             :src="item.url" />
                     </view>
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { formattedFiles, viewImage } from "../../utils/settleFiles.js"
+import { formattedFiles, viewMedias } from "../../utils/settleFiles.js"
 export default {
     data() {
         return {
@@ -123,8 +123,8 @@ export default {
 
         },
         /* 预览图片 */
-        viewImages(url) {
-            viewImage(url)
+        viewImages(item) {
+            viewMedias(this.detail.attinfos.filter(v => v.fileType == 'image'),this.detail.attinfos.indexOf(item),'image')
         },
         changeComment(e) {
             this.commentText = e.detail.value;
@@ -217,7 +217,7 @@ export default {
             .item {
                 margin: 0 10px 10px 0;
                 display: inline-block;
-
+                border-radius: 5px;
                 &:nth-child(3n) {
                     margin-right: 0 !important;
                 }

cloud/mySubscription/list.vue

@@ -59,6 +59,8 @@ export default {
           padding-bottom: 10px;
           border-bottom: 1px solid #DDDDDD;
           font-family: Source Han Sans SC, Source Han Sans SC;
+          border-top-left-radius: 5px;
+          border-top-right-radius: 5px;
           .avatar-info {
               display: flex;
               .avatar {
@@ -116,6 +118,7 @@ export default {
           display: flex;
           align-items: center;
           align-content: center;
+          border-radius: 5px;
           text {
               font-size: 14px;
               color: #333333;

components/my_form.vue

@@ -244,7 +244,7 @@
                                         <icon class="icon" color="#E3041F" type="clear" size="2.733vw" />
                                         {{ item.errText }}
                                     </view>
-                                    <u--input :focus="showUModal" @input="onTagInput($event, index)"
+                                    <u--input :maxlength="item.maxlength?item.maxlength:'99999'" :focus="showUModal" @input="onTagInput($event, index)"
                                         :placeholder="item.placeholder || '请输入'" v-model="tagValue" border="bottom"
                                         clearable />
                                 </view>

packageA/exam/result.vue

@@ -180,6 +180,13 @@ export default {
                     parentid: ''
                 })
             }
+            if (e.一级分类 == '') {
+                crumbs.splice(1,crumbs.length - 1)
+                crumbs.push({
+                    classname:'全部',
+                    parentid: ''
+                })
+            }
             this.crumbs = crumbs;
             this.getList(true)
         },

pages/index/cloud/workbench.vue

@@ -74,7 +74,7 @@ export default {
                     "class": ""
                 }
             },
-            userInfoValue: {},
+            userInfoValue: {rolenames:'',name:'',remarks:'',joindays:0},
             roles: [],
             auth:uni.getStorageSync('authList').资料库
         }

pages/index/index/videos.vue

@@ -217,6 +217,7 @@ export default {
         display: flex;
         flex-direction: column;
         margin-bottom: 20px;
+        border-radius: 5px;
         .descript{
             margin-top: 10px;
             text-align: center;

store/budget/changePrice.vue

@@ -5,6 +5,7 @@
             <view style="height: 70px;" />
             
         </view>
+        <view class="height"></view>
         <view class="footer">
             <view class="add" :class="uncomplete ? 'forbidden' : ''" hover-class="navigator-hover"
                 @click="uncomplete || loading ? '' : submit()">
@@ -189,6 +190,9 @@ export default {
     padding: 10px 10px 0 10px;
     box-sizing: border-box;
 }
+.height {
+    height: 20px;
+}
 .footer {
     position: fixed;
     bottom: 0;