统一头部 条件编译头像显示

src/config/index.config.js

@@ -2,8 +2,8 @@ const CONFIG = {
     //开发环境配置
     development: {
         assetsPath: '/static', // 静态资源路径
-        // baseUrl: 'http://tyou.xiudo.cn/merch',  // 后台接口请求地址
-        baseUrl: 'http://192.168.100.135:83/merch',  // 后台接口请求地址
+        baseUrl: 'http://tyou.xiudo.cn/merch',  // 后台接口请求地址
+        // baseUrl: 'http://192.168.100.135:83/merch',  // 后台接口请求地址
         hostUrl: 'http://localhost:8080',        // H5地址(前端运行地址)
         websocketUrl: '',        // websocket服务端地址
         weixinAppId: '' // 微信公众号appid

src/pages/index/conversion.vue

@@ -1,8 +1,8 @@
 <!-- 订单兑换 -->
 <template>
   <view class="conversion">
-    <Header :title="title"></Header>
-    <view class="" style="height: 94upx;"></view>
+    <!-- <Header :title="title"></Header>
+    <view class="" style="height: 94upx;"></view> -->
     <view class="order-detail-content">
       <view class="order-message">
         <view class="title">订单信息</view>
@@ -117,10 +117,7 @@ export default {
   methods: {
     // 取消兑换
     cancelChange() {
-      this.type = false;
-      this.masktxt = '是否取消兑换？';
-      this.iconShow = false;
-      this.isShowMask = true;
+      this.$mRouter.back();
     },
 
     //  确认兑换

src/pages/index/index.vue

@@ -21,6 +21,7 @@
 					</view>
 				</view>
 				<view class="user">
+          <!-- #ifdef MP-WEIXIN -->
 					<view class="user-left">
             <open-data type="userAvatarUrl" class="usericon"></open-data>
 						<view class="message">
@@ -28,6 +29,20 @@
 							<view class="tele"></view>
 						</view>
 					</view>
+          <!-- #endif -->
+          
+          <!-- #ifndef MP-WEIXIN -->
+          <view class="user-left">
+            <view class="usericon">
+              	<image src="../../static/missing-face.png" mode="widthFix"></image>
+            </view>
+						<view class="message">
+              <view class="name"></view>
+							<view class="tele"></view>
+						</view>
+					</view>
+					<!-- #endif -->
+
 					<view class="user-right" @tap="scanCode">
 						<image src="../../static/images/scan.png" mode="" class="sacnicon"></image>
 						<view class="txt">
@@ -37,9 +52,9 @@
 				</view>
 			</view>
 			<view class="" style="height: 284upx;"></view>
-     
+
       <!-- 输入框 -->
-      <view class="input-code" :animation="animationData">
+      <view class="input-code">
         <input type="text" v-model="ordernum" maxlength="-1" placeholder-style="color:#b8bbbb;font-size:28upx;" class="code" placeholder="请输入兑换码或者订单号">
         <view class="search" @tap="searchOrder">搜索</view>
       </view>
@@ -180,7 +195,7 @@
 								{{ pendingData.payorder }}
 							</view>
 						</view>
-					
+
 					</view>
 				</view>