revert: 所有代码与custom/common分支同

components-diy/diy-merch-list.vue

@@ -51,16 +51,12 @@
 // 文章
 import DiyMinx from './minx.js'
 export default {
-	name: 'diy-merch-list',
+	name: 'diy-article',
 	props: {
 		value: {
 			type: Object
 		}
 	},
-	components: {
-		uniPopup: () => import('@/components/uni-popup/uni-popup.vue'),
-		nsLogin: () => import('@/components/ns-login/ns-login.vue'),
-	},
 	data() {
 		return {
 			list: [