增加公告等相关

ghsApp/src/admin/shop/add.vue

@@ -68,6 +68,10 @@
 					<view class="tui-title">联系电话</view>
 					<input v-model="form.telephone" placeholder-class="phcolor" class="tui-input" name="telephone" placeholder="请输入联系电话" maxlength="50" type="number" />
 				</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title">联系电话2</view>
+					<input v-model="form.telephone2" placeholder-class="phcolor" class="tui-input" name="telephone2" placeholder="请输入联系电话2" maxlength="50" type="number" />
+				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">
 					<view class="tui-title">城市</view>
 					<view class="tui-input" v-if="form.province || form.city">{{ form.province + '-' + form.city }}</view>
@@ -274,6 +278,7 @@ export default {
 				openEndTime: '',
 				mobile: '',
 				telephone:'',
+				telephone2:'',
 				packCost:0,
 				lackExpend:9,
 				meetNum:0,

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -27,7 +27,7 @@
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" v-if="ghsInfo.presell && ghsInfo.presell == 1" style="background-color:#09C567;border:1upx solid #09C567;" @click="aheadCg(ghsInfo)">预订花材</button>
-				<button class="admin-button-com middle blue" @click="delMemory()" v-else>清空已选</button>
+				<!-- <button class="admin-button-com middle blue" @click="delMemory()" v-else>清空已选</button> -->
 			</view>
 		</view>
 

hdApp/src/pagesPurchase/orderItem.vue

@@ -36,7 +36,15 @@
           <text class="info-value">{{info.bigNum}}</text>
         </view>
       </view>
-      <view class="item-price">¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }} <text class="iconfont iconxiangyou"></text>
+      <view class="item-price">
+        
+            <view v-if="info.orderPrice == info.actPrice">¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</view>
+            <view v-else>
+              <text style="text-decoration: line-through;color:#847676;">¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</text>
+              <text style="margin-left:10upx;">¥{{ info.actPrice ? parseFloat(info.actPrice):0 }}</text>
+            </view>
+
+        <text class="iconfont iconxiangyou"></text>
       </view>
     </view>
   </view>

hdApp/src/pagesPurchase/readMe.vue

@@ -1,5 +1,29 @@
 <template>
 	<view class="app-content">
+
+
+		<view class="list" v-if="shopId == 12439">
+			<view>
+				<view class="title" style="margin-bottom:20upx;">下单须知：</view>
+			</view>
+			<view>
+				<view class="title">一、配送方式：</view>
+				<view class="info">1、发快递（默认顺丰）</view>
+				<view class="info">2、自提</view>
+				<view class="info">3、跑腿/叫车</view>
+				<view class="info">4、物流（备注物流）</view>
+				<view class="title">下单没有备注信息的，默认发顺丰快递</view>
+				<view class="title">以任何形式下单发货的，都不包含配送费!</view>
+				<view class="info">本店营业时间为早上9：00——晚上20：00。每天晚上20：00前下单当天发货，20：00后下单次日发货，所有下单的客户没有备注生熟度的，全部发生花！！！</view>
+				<view class="title">二、售后须知：</view>
+				<view class="info">鲜花是生鲜活类产品，一旦送出后无质量问题不退不换，收到货请仔细检查数量 品种和质量，有问题请在6小时内联系客服，超6小时不再理赔，所有花材10%为正常损耗不售后，超出的部分可以售后感谢支持!</view>
+				<view class="info">基地玫瑰：基地玫瑰有夹支，畸形花头属于正常，一律不售后。</view>
+				<view class="title">三、花材颜色问题</view>
+				<view class="info">根据天气变化原因，玫瑰草花多头等其他品种会出现颜色色差问题，但品种是一样的！！！</view>
+			</view>
+		</view>
+
+
 		<view class="list" v-if="shopId == 40312">
 			<view>
 				<view class="title">下单须知：</view>