update: 样式

src/views/ecm/form.vue

@@ -159,7 +159,7 @@
                   <el-option label="小于等于" :value="5"></el-option>
                   <el-option label="区间" :value="6"></el-option>
                 </el-select>
-                <el-input-number controls-position="right" :disabled="!isAdd" v-model="discount_limit.count" :precision="2" :min="0" :max="discount_limit.count2 || 10" class="w150"></el-input-number>&nbsp;&nbsp;<template v-if="discount_limit.type == 6">至&nbsp;&nbsp;<el-input-number controls-position="right" :disabled="!isAdd" v-model="discount_limit.count2" :precision="2" :min="discount_limit.count || 0" :max="10" class="w150"></el-input-number>&nbsp;&nbsp;</template>折<el-popover v-if="discount_limit.type == 6" placement="right" title="" width="200" trigger="hover" content="包含边界值"><i class="el-icon-info ml5 gray" slot="reference"></i></el-popover>
+                <el-input-number style="vertical-align: middle" controls-position="right" :disabled="!isAdd" v-model="discount_limit.count" :precision="2" :min="0" :max="discount_limit.count2 || 10" class="w150"></el-input-number>&nbsp;&nbsp;<template v-if="discount_limit.type == 6">至&nbsp;&nbsp;<el-input-number style="vertical-align: middle" controls-position="right" :disabled="!isAdd" v-model="discount_limit.count2" :precision="2" :min="discount_limit.count || 0" :max="10" class="w150"></el-input-number>&nbsp;&nbsp;</template>折<el-popover v-if="discount_limit.type == 6" placement="right" title="" width="200" trigger="hover" content="包含边界值"><i class="el-icon-info ml5 gray" slot="reference"></i></el-popover>
                 <div class="fz12 gray">* 商品折扣 = 商品实付 / 吊牌价</div>
               </div>
               <span class="fz14 gray" v-else>不限制消费商品折扣</span>

src/views/ecm/marketing-event/components/lib-teletext.vue

@@ -40,7 +40,7 @@
     </el-radio-group>
     <dm-pagination v-show="textImgList.length" class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="prev, pager, next" :total="total"></dm-pagination>
     <p v-if="singleFlag" class="minor-font-color mb10">* 将使用微信客服接口发送，已按微信规则过滤图文数目大于1的图文。</p>
-    <p v-if="singleFlag" class="minor-font-color mb10">* 只有开通微信支付的商户，可以获得图文插入H5链接跳转其他网址的功能。</p>
+    <p v-if="singleFlag" class="minor-font-color mb10">* 只有开通微信支付的商户，才能获得图文插入H5链接跳转其他网址的功能。</p>
     <span slot="footer" class="dialog-footer">
       <el-button @click="close">关 闭</el-button>
       <el-button type="primary" @click="addItem">确 定</el-button>

src/views/game/common/links.vue

@@ -2,7 +2,7 @@
   <el-dialog title="游戏链接下载" :visible.sync="show" width="600px" :before-close="close">
     <div class="link-tip">
       <i class="el-icon-info"></i>
-      使用“小程序链接”，非会员进入游戏页面将提示进行认证注册成为会员，认证成功后自动返回游戏页面，建议采用小程序链接哦
+      使用“小程序链接”，非会员进入游戏页面将提示进行认证注册成为会员，认证成功后自动返回游戏页面，建议采用小程序链接
     </div>
     <div class="link-title">
       <i class="icon iconfont icon-xiaochengxu4" style="color:#6457AD"></i>
@@ -19,7 +19,7 @@
       <div class="links__qr">
         <!-- <vue-qr id="qrWrap" :text="qcText" :size="102" :margin="0" :logoMargin="10"></vue-qr> -->
         <div style="text-align:center">
-          <el-image style="width:102px;height:102px" lazy :src="miniprogram.url">
+          <el-image style="width:102px;height:102px;border:4px solid #fff" lazy :src="miniprogram.url">
             <!-- <img slot="placeholder" style="width:102px;height:102px" src="@/assets/img/loaderror.png" /> -->
             <div slot="placeholder" style="display:flex;align-items:center;justify-content:center;width:100%;height:100%;">
               <i class="el-icon-picture-outline" style="font-size:30px"></i>
@@ -161,7 +161,7 @@ export default {
   // border: 1px solid #ddd;
   flex: 1;
   &--url {
-    height: 130px;
+    height: 138px;
     overflow-x: hidden;
     overflow-y: auto;
     word-break: break-all;
@@ -198,6 +198,7 @@ export default {
   font-weight: 500;
   color: #303133;
   line-height: 20px;
+  margin-top: 20px;
   i {
     font-size: 20px;
     margin-right: 8px;
@@ -208,6 +209,7 @@ export default {
   background: #e6f7ff;
   border-radius: 4px;
   border: 1px solid #91d5ff;
+  font-size: 13px;
   color: #606266;
   line-height: 1.2;
   padding: 10px 0;
@@ -221,6 +223,11 @@ export default {
     font-size: 12px;
   }
 }
+#qrWrap {
+  /deep/ img {
+    border: 4px solid #fff;
+  }
+}
 </style>
 
 <style lang="scss">