合并

pages/goods/order_details/index.vue

@@ -387,14 +387,14 @@ import authorize from '@/components/Authorize';
 // #endif
 import colors from "@/mixins/color";
 import invoicePicker from '../components/invoicePicker/index.vue';
-import invoiceModal from '../components/invoiceModal/index.vue'
+// import invoiceModal from '../components/invoiceModal/index.vue'
 import zbCode from '@/components/zb-code/zb-code.vue'
 export default {
 	components: {
 		payment,
 		home,
 		invoicePicker,
-		invoiceModal,
+		// invoiceModal,
 		orderGoods,
 		zbCode,
 		// #ifdef MP

pages/goods/order_details/index_mall.vue

@@ -352,8 +352,8 @@
 		<!-- #endif -->
 		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
 			:totalPrice='totalPrice' :friendPay="true"></payment>
-		<invoiceModal :aleartStatus="aleartStatus" :invoiceData="invoiceData" @close="aleartStatus=false">
-		</invoiceModal>
+		<!-- <invoiceModal :aleartStatus="aleartStatus" :invoiceData="invoiceData" @close="aleartStatus=false">
+		</invoiceModal> -->
 		<view class="mask invoice-mask" v-if="aleartStatus" @click="aleartStatus = false"></view>
 		<view class="mask more-mask" v-if="moreBtn" @click="moreBtn = false"></view>
 		<invoice-picker :inv-show="invShow" :is-special="special_invoice" :url-query="urlQuery" :inv-checked="invChecked" :order-id='order_id'
@@ -403,14 +403,14 @@
 	// #endif
 	import colors from "@/mixins/color";
 	import invoicePicker from '../components/invoicePicker/index.vue';
-	import invoiceModal from '../components/invoiceModal/index.vue'
+	// import invoiceModal from '../components/invoiceModal/index.vue'
 	import zbCode from '@/components/zb-code/zb-code.vue'
 	export default {
 		components: {
 			payment,
 			home,
 			invoicePicker,
-			invoiceModal,
+			// invoiceModal,
 			orderGoods,
 			zbCode,
 			// #ifdef MP

pages/goods_details/index_mall.vue

@@ -337,9 +337,9 @@
 						</view>
 					</view> -->
 			</view>
-			<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet"
+			<!-- <shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet"
 				@closeChange="closeChange" :showAnimate="showAnimate" @boxStatus="boxStatus">
-			</shareRedPackets>
+			</shareRedPackets> -->
 			<!-- 组件 -->
 			<productWindow :attr="attr" :isShow="1" :iSplus="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
 				@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id="product-window"
@@ -450,7 +450,7 @@
 	import couponListWindow from "@/components/couponListWindow";
 	import productWindow from "@/components/productWindow";
 	import userEvaluation from "@/components/userEvaluation";
-	import shareRedPackets from "@/components/shareRedPackets";
+	// import shareRedPackets from "@/components/shareRedPackets";
 	import kefuIcon from "@/components/kefuIcon";
 	import menuIcon from "@/components/menuIcon.vue";
 	import {
@@ -480,7 +480,7 @@
 			couponListWindow,
 			productWindow,
 			userEvaluation,
-			shareRedPackets,
+			// shareRedPackets,
 			kefuIcon,
 			menuIcon,
 			cusPreviewImg,

pages/index/index.vue

@@ -3,11 +3,7 @@
 </template>
 
 <script>
-	import diy from './diy'
 	import diyC from './diy/index_mall.vue'
-	import {
-		getShare
-	} from "@/api/public.js";
 	export default {
 		data() {
 			return {
@@ -16,7 +12,6 @@
 			}
 		},
 		components: {
-			diy,
 			diyC
 		},
 		onShow() {