chore:在线留言提交后，再次打开在线留言，输入框会清空上次内容

pages_tool/member/collection.vue

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
     <view :style="themeColor">
         <mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh"
             v-if="storeToken">
@@ -75,78 +74,6 @@ export default {
             }
         }
     }
-=======
-	<view :style="themeColor">
-		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh">
-			<block class="goods_list" slot="list">
-				<block v-if="collectionList.length > 0">
-					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index"
-						@click.stop="toDetail(item)">
-						<view class="pic">
-							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill"
-								@error="goodsImageError(index)"></image>
-						</view>
-						<view class="goods_info">
-							<view class="goods_name font-size-base">{{ item.sku_name }}</view>
-							<view class="goods_opection">
-								<view class="left  lineheight-clear ">
-									<text class="symbol price-style small">￥</text>
-									<text class="price price-style large">{{
-										parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
-									<text class="symbol price-style small">.{{
-										parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
-								</view>
-								<view class="right">
-									<view class="cars" @click.stop="deleteItem(item.goods_id)">
-										<view class="icon iconfont icon-icon7"></view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</block>
-				<!-- 第一个列表为空时 -->
-				<view class="collection-empty" v-else>
-					<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品"
-						:isIndex="Boolean(storeToken)" :emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"></ns-empty>
-					<button type="primary" size="mini" class="button mini" v-if="!storeToken"
-						@click="toLogin">{{ $lang('toLogin') }}</button>					
-				</view>
-
-				<ns-goods-recommend ref="goodsRecommend"></ns-goods-recommend>
-			</block>
-		</mescroll-uni>
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
-	</view>
-</template>
-
-<script>
-import common from './public/js/common.js';
-import collection from './public/js/collection.js';
-
-export default {
-	mixins: [common, collection],
-	data() {
-		return {};
-	},
-	onShow() {
-		if (this.storeToken) {
-			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
-		} else {
-			this.$nextTick(() => {
-				this.$refs.loadingCover.hide();
-			});
-		}
-	},
-	watch: {
-		storeToken: function (nVal, oVal) {
-			if (nVal) {
-				this.$refs.mescroll.refresh();
-			}
-		}
-	}
->>>>>>> remotes/origin/dev/1.0
 };
 </script>