Merge remote-tracking branch 'origin/dev' into dev

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 components/m-buy/goods.vue

@@ -112,9 +112,7 @@
   </div>
</template>
<script>
import UPopup from '@/uview-components/uview-ui/components/u-popup/u-popup.vue';
import UImage from '@/uview-components/uview-ui/components/u-image/u-image.vue';
import UAlertTips from '@/uview-components/uview-ui/components/u-alert-tips/u-alert-tips.vue';
import '@/components/uview-components/uview-ui';

import * as API_trade from '@/api/trade.js';
import setup from './popup';