Merge remote-tracking branch 'origin/dev' into dev

src/mods/AppIntegralApply/AppIntegralApply.vue

@@ -29,7 +29,6 @@
               <span>{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
 
               <span v-if="item.auditStatus == 1">
-                <span v-if="item.auditIntegral * 1 > 0">+</span>
                 <span>{{ item.auditIntegral }}分</span>
               </span>
             </span>

src/mods/AppIntegralApply/add.vue

@@ -200,7 +200,7 @@ export default {
           .form-item__right {
             display: flex;
             align-items: center;
-            font-size: 32px;
+            font-size: 28px;
 
             span {
               max-width: 400px;

src/mods/AppIntegralApply/detail.vue

@@ -61,7 +61,6 @@
       <div class="cards" v-if="detail.auditStatus == 1">
         <div class="cards-left">积分调整</div>
         <div class="cards-right" style="width: 75%; text-align: right">
-          <span v-if="detail.auditIntegral * 1 > 0">+</span>
           <span>{{ detail.auditIntegral }}分</span>
         </div>
       </div>

src/mods/AppServiceOnlineNew/serviceForm.vue

@@ -100,6 +100,8 @@
                 </u-checkbox-group>
               </div>
             </div>
+
+            <!-- 8是年月日 时分秒 -->
             <div class="form-item" v-if="field.fieldDataType === '8'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
@@ -113,6 +115,7 @@
               </div>
             </div>
 
+            <!-- 3是 年月日 -->
             <div class="form-item" v-if="field.fieldDataType === '3'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
@@ -127,12 +130,12 @@
               </div>
             </div>
 
-            <!-- 时间日期 -->
             <div class="form-item" v-if="field.fieldDataType === '9'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
                 <span>{{ field.fieldName }}{{ field.fieldNameSuffix || '' }}</span>
               </div>
+
               <div class="form-item__wrapper">
                 <input placeholder="请选择" disabled :value="field.fieldDictName || ''" />
                 <picker range-key="dictName" :range="$dict.getDict(field.dictionaryCode)" :data-index="index" :data-i="i" :data-dict="field.dictionaryCode" @change="onPickerChange">