Merge branch 'feature/12月迭代' into dev

src/views/recharge/consume.vue

@@ -66,7 +66,8 @@
         <!-- <el-table-column label="模板ID" align="left" width="100" prop="chartsDate"></el-table-column> -->
         <el-table-column label="短信内容" align="left" min-width="200" prop="remark">
           <template slot-scope="scope">
-            <el-popover class="item" trigger="hover" width="400" v-if="scope.row.remark && scope.row.remark.length > 10" :content="scope.row.remark" placement="top-start">
+            <el-popover class="item" trigger="hover" v-if="scope.row.remark && scope.row.remark.length > 10" placement="top-start">
+              <div style="max-width: 400px">{{ scope.row.remark }}</div>
               <span class="ellipsis" slot="reference">{{ scope.row.remark }}</span>
             </el-popover>
             <span v-else>{{ scope.row.remark }}</span>