|
|
@@ -37,13 +37,9 @@
|
|
|
<script>
|
|
|
import banner from './parts/banner_1.vue';
|
|
|
export default {
|
|
|
-<<<<<<< HEAD
|
|
|
- components: {},
|
|
|
-=======
|
|
|
components: {
|
|
|
banner
|
|
|
},
|
|
|
->>>>>>> 05da159d61256c6a0236cdc1ed80cfc988b67efa
|
|
|
data() {
|
|
|
return {
|
|
|
// 系统设置
|
|
|
@@ -95,17 +91,6 @@
|
|
|
type: '1'
|
|
|
}
|
|
|
],
|
|
|
-<<<<<<< HEAD
|
|
|
- // one_2
|
|
|
- // 商品价格
|
|
|
- infospecs: {},
|
|
|
- // one_3
|
|
|
- discount: {
|
|
|
- full_decrement: [
|
|
|
- '测试一'
|
|
|
- ]
|
|
|
- }
|
|
|
-=======
|
|
|
// 系统菜单
|
|
|
barList: [],
|
|
|
is_menu: false,
|
|
|
@@ -128,7 +113,6 @@
|
|
|
show: false,
|
|
|
type: '1'
|
|
|
},
|
|
|
->>>>>>> 05da159d61256c6a0236cdc1ed80cfc988b67efa
|
|
|
};
|
|
|
},
|
|
|
onLoad: async function(e) {
|
|
|
@@ -340,10 +324,6 @@
|
|
|
that.$set(that, `btn_type`, e.content.type);
|
|
|
that.$refs.specShow.open();
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
-
|
|
|
- },
|
|
|
-=======
|
|
|
// 配置分享内容
|
|
|
configShare() {
|
|
|
const that = this;
|
|
|
@@ -358,7 +338,6 @@
|
|
|
}
|
|
|
},
|
|
|
}
|
|
|
->>>>>>> 05da159d61256c6a0236cdc1ed80cfc988b67efa
|
|
|
}
|
|
|
</script>
|
|
|
|
