输入框优化

mall/src/components/app-delivery.vue

@@ -132,16 +132,18 @@
             <label for="needGift" class="need-gift">需要贺卡</label>
           </div>
           <div class="gitf-textarea">
-            <textarea
-              v-model="form.cardInfo"
-              class="tui-textarea"
-              placeholder-class="phcolor"
-              placeholder-style="color:#ccc"
-              name="cardInfo"
-              placeholder="请填写贺卡内容，留空将寄出空白贺卡"
-              auto-height
-            />
-            <!-- <app-textarea v-model="form.cardInfo" placeholder="请填写贺卡内容" @blur="blursave('blur')" /> -->
+          
+
+        <input
+          v-model="form.cardInfo"
+          placeholder-class="phcolor"
+          placeholder-style="color:#ccc"
+          class="tui-input"
+          name="cardInfo"
+          style="width:100%;"
+          placeholder="请填写贺卡内容，留空将寄出空白贺卡"
+        />
+
           </div>
         </div>
       </tui-list-cell>

shop/src/views/member/list.vue

@@ -83,6 +83,11 @@
 				<el-tag size="small" v-else>{{ scope.row.userAsset.member }}</el-tag>
 			</template>
 
+			<template #table-column-discount="{scope}">
+				<template v-if="scope.row.userAsset.discount < 1">{{scope.row.userAsset.discount}}</template>
+				<template v-else>-</template>
+			</template>
+
 			<!-- 充值 -->
 			<template #slot-recharge="{scope}">
 				<el-button type="text" size="mini" @click="rechargeShowFn(scope.row)">充值</el-button>
@@ -336,6 +341,11 @@ export default {
 							label: '成长值',
 							align: 'center'
 						},
+						{
+							prop: 'discount',
+							label: '折扣',
+							align: 'center'
+						},
 						{
 							prop: 'balance',
 							label: '余额',
@@ -343,7 +353,7 @@ export default {
 						},
 						{
 							prop: 'subscribe',
-							label: '关注公众号',
+							label: '粉丝',
 							align: 'center',
 							sortable: false,
 							width: 150