Merge branch 'master' of git.huaml.com:zhh/front-end

hdApp/src/admin/custom/selectCustom.vue

@@ -300,7 +300,7 @@
     }
   
     .tui-msg-content {
-      width:500upx;
+      width:550upx;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;

hdApp/src/admin/hb/ruleList.vue

@@ -8,10 +8,8 @@
                             <view class="app-size-28 app-color-0">满<text style="margin-left: 6upx;font-size: 32upx; font-weight: bold">{{ formatAmountDisplay(item.amount) }}元</text>，送{{ item.num }}红包(共{{ formatAmountDisplay(item.allHbAmount) }}元)</view>
                         </view>
                         <view class="confirm-btn">
-                            <button class="admin-button-com middle blue"
-                                style="position:absolute;top:50rpx;right: 130rpx" @click.stop="navigateToSendHb(item)">修改</button>
-                            <button class="admin-button-com middle blue"
-                                style="position:absolute;top:50rpx;right: 5rpx" @click.stop="deleteRule(item, index)">删除</button>
+                            <button class="admin-button-com big blue" @click.stop="navigateToSendHb(item)">修改</button>
+                            <button class="admin-button-com big blue" style="margin-left: 20upx;" @click.stop="deleteRule(item, index)">删除</button>
                         </view>
                     </view>
                 </block>
@@ -21,7 +19,7 @@
             </block>
         </view>
         <view class="app-footer">
-			<button class="admin-button-com middle blue" @click="addHbRuleFn">创建规则</button>
+			<button class="admin-button-com big blue" @click="addHbRuleFn">创建规则</button>
 		</view>
     </view>
 </template>
@@ -101,7 +99,7 @@ export default {
 
     .list {
         height: 160upx;
-        @include disFlex(center, flex-start);
+        @include disFlex(center, space-between);
         padding: 30upx 0;
         margin: 0 15upx;
         color: $fontColor3;
@@ -110,6 +108,7 @@ export default {
 
         .list-det {
             margin-left: 20upx;
+            flex: 1;
             &>div {
                 margin-top: 14rpx;
                 &:first-child {
@@ -117,6 +116,11 @@ export default {
                 }
             }
         }
+        
+        .confirm-btn {
+            display: flex;
+            align-items: center;
+        }
     }
 }
 

hdApp/src/admin/hb/sendHb.vue

@@ -17,14 +17,14 @@
         <text class="title">赠送红包设置</text>
       </view>
       <view class="rule-card" v-for="(item, index) in rules" :key="index">
-        <view class="form-item">
-          <view class="label">红包金额</view>
-          <input class="input" type="digit" v-model="item.hbAmount" placeholder="请输入金额" />
-        </view>
         <view class="form-item">
           <view class="label">红包数量</view>
           <input class="input" type="digit" v-model="item.hbNum" placeholder="请输入数量" />
         </view>
+        <view class="form-item">
+          <view class="label">红包金额</view>
+          <input class="input" type="digit" v-model="item.hbAmount" placeholder="请输入金额" />
+        </view>
         <view class="form-item">
           <view class="label">有效时长</view>
           <input class="input" type="number" v-model="item.duration" placeholder="请输入天数，填0是永不过期" />