Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/pages/setting/membershipLevel/index.vue

@@ -203,7 +203,7 @@ export default {
         {
           slot: 'image',
           minWidth: 35,
-          title: '图标',
+          title: '背景图',
         },
         {
           key: 'name',
@@ -241,7 +241,6 @@ export default {
           title: '是否显示',
         },
         {
-          fixed: 'right',
           minWidth: 120,
           slot: 'action',
           title: '操作',

template/uni-app/pages/annex/special/index.vue

@@ -449,13 +449,11 @@
 					});
 			},
 			goDetail(item) {
-
 				goShopDetail(item, this.uid).then(res => {
 					uni.navigateTo({
 						url: `/pages/goods_details/index?id=${item.id}`
 					});
 				});
-
 			},
 			// #ifdef H5
 			// 微信分享；