Merge branch 'dev' of http://115.159.76.241/gicmember/member

src/components/wechatmembers/cardvoucher.vue

@@ -135,8 +135,8 @@
                     <span v-if="scope.row.status === 6">已到期</span>
                     <span v-if="scope.row.status === 7">已销毁</span>
                     <span v-if="scope.row.status === 8">已占用</span>
-                    <span v-if="scope.row.status === 9">转正中</span>
-                    <span v-if="scope.row.status === 10">已转正</span>
+                    <span v-if="scope.row.status === 9">转赠中</span>
+                    <span v-if="scope.row.status === 10">已转赠</span>
                   </template>
                 </el-table-column>
                 <el-table-column