5.27

admin/.env.development

@@ -6,6 +6,7 @@ ENV = 'development'
 #VUE_APP_BASE_API = 'http://0.0.0.0:8324'
 
 VUE_APP_BASE_API = 'https://hongbaomi.com'
+# VUE_APP_BASE_API = 'https://hbm.hdlkeji.com'
 
 # socket 连接地址
 #VUE_APP_WS_URL = 'ws://0.0.0.0:8324'

admin/.env.staging

@@ -1,3 +1,4 @@
+# NODE_ENV = production
 NODE_ENV = production
 
 # just a flag

admin/src/api/request.js

@@ -15,7 +15,7 @@ const instance = axios.create({
   baseURL: SettingMer.https,
   timeout: 60000
 })
-const defaultOpt = {login: true}
+const defaultOpt = { login: true }
 
 function baseRequest(options) {
   const token = store.getters.token
@@ -28,7 +28,7 @@ function baseRequest(options) {
     instance(options).then(res => {
       const data = res.data || {}
       if (res.status !== 200) {
-        return reject({message: '请求失败', res, data})
+        return reject({ message: '请求失败', res, data })
       }
 
       if ([410000, 410001, 410002, 40000].indexOf(data.status) !== -1) {
@@ -38,9 +38,9 @@ function baseRequest(options) {
       } else if (data.status === 200) {
         return resolve(data, res)
       } else {
-        return reject({message: data.message, res, data})
+        return reject({ message: data.message, res, data })
       }
-    }).catch(message => reject({message}));
+    }).catch(message => reject({ message }));
   })
 }
 /**
@@ -58,7 +58,7 @@ const request = ['post', 'put', 'patch', 'delete'].reduce((request, method) => {
    */
   request[method] = (url, data = {}, options = {}) => {
     return baseRequest(
-      Object.assign({url, data, method}, defaultOpt, options)
+      Object.assign({ url, data, method }, defaultOpt, options)
     )
   }
   return request
@@ -74,7 +74,7 @@ const request = ['post', 'put', 'patch', 'delete'].reduce((request, method) => {
    */
   request[method] = (url, params = {}, options = {}) => {
     return baseRequest(
-      Object.assign({url, params, method}, defaultOpt, options)
+      Object.assign({ url, params, method }, defaultOpt, options)
     )
   }
 })

admin/src/libs/settingMer.js

@@ -10,6 +10,7 @@
 import Cookies from "js-cookie";
 // 请求接口地址 如果没有配置自动获取当前网址路径
 const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`
+console.log(process.env.VUE_APP_BASE_API);
 const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || (location.protocol === 'https:' ? 'wss' : 'ws') + ':' + location.hostname
 const login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : ''
 const SettingMer = {

admin/src/views/order/list/orderDetail.vue

@@ -22,10 +22,8 @@
             <div v-if="orderDatalist.order_type === 0 && !orderDatalist.pay_time" class="description-term">订单状态：待付款</div>
             <div v-if="orderDatalist.order_type === 0 && orderDatalist.pay_time" class="description-term">订单状态：{{ orderDatalist.status | orderStatusFilter }}</div>
             <div class="description-term">商品总数：{{ orderDatalist.total_num }}</div>
-            <div class="description-term">商品总价：{{ orderDatalist.total_price }}</div>
-            <div class="description-term">交付邮费：{{ orderDatalist.pay_postage }}</div>
             <div class="description-term">优惠券金额：{{ orderDatalist.coupon_price }}</div>
-            <div class="description-term" v-if="orderDatalist.is_percentage!=1">实际支付：{{ orderDatalist.finalOrder ? (parseFloat(orderDatalist.finalOrder.pay_price) + parseFloat(orderDatalist.pay_price)) : orderDatalist.pay_price }}</div>
+            <!-- <div class="description-term" v-if="orderDatalist.is_percentage!=1">实际支付：{{ orderDatalist.finalOrder ? (parseFloat(orderDatalist.finalOrder.pay_price) + parseFloat(orderDatalist.pay_price)) : orderDatalist.pay_price }}</div> -->
             <div v-if="orderDatalist.integral > 0" class="description-term">红包米抵扣：使用了{{ orderDatalist.integral }}个红包米，抵扣了{{ orderDatalist.integral_price }}元</div>
             <div v-if="orderDatalist.give_integral > 0" class="description-term">赠送红包米：{{ orderDatalist.give_integral }}个</div>
             <div class="description-term">创建时间：{{ orderDatalist.create_time }}</div>
@@ -41,20 +39,25 @@
             <div v-if="orderDatalist.svip_discount" class="description-term">SVIP商品价优惠: {{ orderDatalist.svip_discount }}</div>
             
             <div class="description-term">商家备注：{{ orderDatalist.remark }}</div>
+            <div class="description-term">商品总价：{{ orderDatalist.total_price }}</div>
+            <div class="description-term">交付邮费：{{ orderDatalist.pay_postage }}</div>
             <div class="description-term">付款方式：{{ orderDatalist.is_percentage==1? '百分比付款':'全款'}}</div>
-            <div class="description-term" v-if="orderDatalist.is_percentage==1">首付百分比：{{ 100-orderDatalist.discounts_percentage-orderDatalist.start_percentage}}%</div>
+            <div class="description-term" v-if="orderDatalist.is_percentage==1">首付百分比：{{ 100 - orderDatalist.start_percentage}}%</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">优惠券抵扣：{{ orderDatalist.coupon_price}}元</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">积分抵扣：{{ orderDatalist.integral_price}}元</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">优惠百分比：{{ orderDatalist.discounts_percentage}}%</div>
 
-            <div class="description-term" v-if="orderDatalist.is_percentage==1">实际支付金额：{{(orderDatalist.total_price*1+orderDatalist.pay_postage*1)*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100}}元</div>
+            <!-- <div class="description-term" v-if="orderDatalist.is_percentage==1">实际支付金额：{{(orderDatalist.total_price*1+orderDatalist.pay_postage*1)*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100 - orderDatalist.coupon_price- orderDatalist.integral_price-orderDatalist.svip_discount}}元</div> -->
+            <div class="description-term">实际支付：{{ orderDatalist.finalOrder ? (parseFloat(orderDatalist.finalOrder.pay_price) + parseFloat(orderDatalist.pay_price)) : orderDatalist.pay_price }}元</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.paid ==1">{{orderDatalist.status==0?'已支付尾款':'剩余应支付尾款'}}：{{ orderDatalist.start_percentage<0?0:orderDatalist.start_percentage}}%</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">分销已抵扣：{{ orderDatalist.start_percentage - orderDatalist.residue_percentage }}%</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.start_percentage - orderDatalist.residue_percentage-orderDatalist.start_percentage>0">溢出比例：{{ orderDatalist.start_percentage - orderDatalist.residue_percentage-orderDatalist.start_percentage}}%</div>
 
-            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status==4&&orderDatalist.paid ==1">应支付尾款： {{((orderDatalist.total_price*1+orderDatalist.pay_postage*1) * orderDatalist.residue_percentage) / 100>0?((orderDatalist.pay_price*100/(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage) * orderDatalist.residue_percentage) / 100).toFixed(2):0}}元</div>
+            <!-- <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status==4&&orderDatalist.paid ==1">应支付尾款： {{((orderDatalist.total_price*1+orderDatalist.pay_postage*1) * orderDatalist.residue_percentage) / 100>0?((orderDatalist.pay_price*100/(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage) * orderDatalist.residue_percentage) / 100).toFixed(2):0}}元</div> -->
+            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status==4&&orderDatalist.paid ==1">应支付尾款： {{ (orderDatalist.total_price* (orderDatalist.start_percentage) / 100).toFixed(2)>0?(orderDatalist.total_price* (orderDatalist.start_percentage) / 100).toFixed(2) : 0}}元</div>
 
-            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status!=4&&orderDatalist.paid ==1">应支付尾款： {{(orderDatalist.pay_price-orderDatalist.total_price*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100).toFixed(2)}}元</div>
+            <!-- <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status!=4&&orderDatalist.paid ==1">应支付尾款： {{(orderDatalist.pay_price-orderDatalist.total_price*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100).toFixed(2)}}元</div> -->
+            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status!=4&&orderDatalist.paid ==1">应支付尾款： 0元</div>
 					
           </div>
            <template>

mer/.env.development

@@ -4,6 +4,7 @@ ENV = 'development'
 # base api
 
 VUE_APP_BASE_API = 'https://hongbaomi.com'
+# VUE_APP_BASE_API = 'https://hbm.hdlkeji.com/'
 # socket 连接地址
 VUE_APP_WS_URL = 'ws://mer1.crmeb.net'
 

mer/.env.staging

@@ -1,4 +1,5 @@
-NODE_ENV = production
+# NODE_ENV = production
+NODE_ENV = development
 
 # just a flag
 ENV = 'staging'

mer/package.json

@@ -41,6 +41,7 @@
   "dependencies": {
     "@form-create/element-ui": "2.5",
     "axios": "0.18.1",
+    "body-parser": "^1.20.2",
     "clipboard": "2.0.6",
     "codemirror": "5.45.0",
     "core-js": "^2.6.12",
@@ -49,7 +50,7 @@
     "driver.js": "0.9.5",
     "dropzone": "5.5.1",
     "echarts": "^4.2.1",
-    "element-ui": "^2.15.12",
+    "element-ui": "^2.15.14",
     "exceljs": "^4.3.0",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
@@ -68,6 +69,7 @@
     "screenfull": "4.2.0",
     "showdown": "1.9.0",
     "sortablejs": "^1.15.0",
+    "svg-baker-runtime": "^1.4.7",
     "view-design": "^4.3.2",
     "vue": "2.6.10",
     "vue-awesome-swiper": "^3.1.3",
@@ -99,6 +101,7 @@
     "connect": "3.6.6",
     "eslint": "5.15.3",
     "eslint-plugin-vue": "5.2.2",
+    "file-loader": "^6.2.0",
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
@@ -129,4 +132,4 @@
   "directories": {
     "test": "tests"
   }
-}
+}

mer/src/views/order/orderDetail.vue

@@ -23,10 +23,8 @@
             <div v-if="orderDatalist.order_type === 0 && orderDatalist.pay_time" class="description-term">订单状态：{{ orderDatalist.status | orderStatusFilter }}</div>
             <div v-if="orderDatalist.order_type === 1 && orderDatalist.pay_time" class="description-term">订单状态：{{ orderDatalist.status | cancelOrderStatusFilter }}</div>
             <div class="description-term">商品总数：{{ orderDatalist.total_num }}</div>
-            <div class="description-term">订单总价：{{ orderDatalist.total_price }}</div>
-            <div class="description-term">交付邮费：{{ orderDatalist.pay_postage }}</div>
             <div class="description-term">优惠券金额：{{ orderDatalist.coupon_price }}</div>
-            <div class="description-term">实际支付：{{ orderDatalist.finalOrder ? (parseFloat(orderDatalist.finalOrder.pay_price) + parseFloat(orderDatalist.pay_price)) : orderDatalist.pay_price }}</div>
+            
             <div v-if="orderDatalist.integral > 0" class="description-term">红包米抵扣：使用了{{ orderDatalist.integral }}个红包米，抵扣了{{ orderDatalist.integral_price }}元</div>
             <div v-if="orderDatalist.give_integral > 0" class="description-term">赠送红包米：{{ orderDatalist.give_integral }}个</div>
             <div class="description-term">创建时间：{{ orderDatalist.create_time }}</div>
@@ -41,30 +39,34 @@
             </div>
             <div v-if="orderDatalist.svip_discount" class="description-term">SVIP商品价优惠: {{ orderDatalist.svip_discount }}</div>
             <div class="description-term">商家备注：{{ orderDatalist.remark }}</div>
-            <div class="description-term" v-if="orderDatalist.is_percentage==1">首付百分比：{{ 100-orderDatalist.discounts_percentage-orderDatalist.residue_percentage}}%</div>
+            <div class="description-term">订单总价：{{ orderDatalist.total_price }}</div>
+            <div class="description-term">交付邮费：{{ orderDatalist.pay_postage }}</div>
+            <div class="description-term" v-if="orderDatalist.is_percentage==1">首付百分比：{{ 100 - orderDatalist.start_percentage}}%</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">优惠券抵扣：{{ orderDatalist.coupon_price}}元</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">积分抵扣：{{ orderDatalist.integral_price}}元</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">优惠百分比：{{ orderDatalist.discounts_percentage}}%</div>
-
-            <div class="description-term" v-if="orderDatalist.is_percentage==1">实际支付金额：{{(orderDatalist.total_price*1+orderDatalist.pay_postage*1)*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100}}元</div>
+            <div class="description-term" v-if="orderDatalist.is_percentage==1">应支付金额：{{(orderDatalist.total_price*1+orderDatalist.pay_postage*1)*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100}}元</div>
+            <div class="description-term">实际支付：{{ orderDatalist.finalOrder ? (parseFloat(orderDatalist.finalOrder.pay_price) + parseFloat(orderDatalist.pay_price)) : orderDatalist.pay_price }}元</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.paid ==1">{{orderDatalist.status==0?'已支付尾款':'剩余应支付尾款'}}：{{ orderDatalist.start_percentage<0?0:orderDatalist.start_percentage}}%</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1">分销已抵扣：{{ orderDatalist.start_percentage - orderDatalist.residue_percentage }}%</div>
             <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.start_percentage - orderDatalist.residue_percentage-orderDatalist.start_percentage>0">溢出比例：{{ orderDatalist.start_percentage - orderDatalist.residue_percentage-orderDatalist.start_percentage}}%</div>
 
-            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status==4&&orderDatalist.paid ==1">应支付尾款： {{((orderDatalist.total_price*1+orderDatalist.pay_postage*1) * orderDatalist.residue_percentage) / 100>0?((orderDatalist.pay_price*100/(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage) * orderDatalist.residue_percentage) / 100).toFixed(2):0}}元</div>
+            <!-- <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status==4&&orderDatalist.paid ==1">应支付尾款： {{((orderDatalist.total_price*1+orderDatalist.pay_postage*1) * orderDatalist.residue_percentage) / 100>0?((orderDatalist.pay_price*100/(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage) * orderDatalist.residue_percentage) / 100).toFixed(2):0}}元</div>
 
-            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status!=4&&orderDatalist.paid ==1">应支付尾款： {{(orderDatalist.pay_price-orderDatalist.total_price*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100).toFixed(2)}}元</div>
-					
+            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status!=4&&orderDatalist.paid ==1">应支付尾款： {{(orderDatalist.pay_price-orderDatalist.total_price*(100-orderDatalist.start_percentage-orderDatalist.discounts_percentage)/100).toFixed(2)}}元</div> -->
+					          
+            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status==4&&orderDatalist.paid ==1">应支付尾款： {{ (orderDatalist.total_price* (orderDatalist.start_percentage) / 100).toFixed(2)>0?(orderDatalist.total_price* (orderDatalist.start_percentage) / 100).toFixed(2) : 0}}元</div>
+            <div class="description-term" v-if="orderDatalist.is_percentage==1&&orderDatalist.status!=4&&orderDatalist.paid ==1">应支付尾款： 0元</div>
           </div>
           <template v-if="orderDatalist.order_extend">
             <el-divider />
             <div class="title">用户提交信息</div>
             <div class="acea-row">
-              <div v-for="(item,i) in orderDatalist.order_extend" class="description-term">
+              <div v-for="(item,i) in orderDatalist.order_extend" class="description-term" :key="i">
                 <span v-if="!Array.isArray(item)">{{i}}：{{item}}</span>
                 <span v-else>
                   {{i}}：
-                  <img v-for="(pic,idx) in item" :src="pic" style="width:30px;height:30px;position:relative;top:10px;"/>
+                  <img v-for="(pic,idx) in item" :key="idx" :src="pic" style="width:30px;height:30px;position:relative;top:10px;"/>
                 </span>
               </div>
             </div>

uni-app/components/orderGoods/index.vue

@@ -10,74 +10,115 @@
 					<view class='item presell_item'>
 						<view class="acea-row row-between-wrapper">
 							<view class='pictrue' @click="jumpCon(item)">
-								<image :src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image' ></image>
+								<image
+									:src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image'>
+								</image>
 							</view>
 							<view class='text'>
 								<view class='acea-row row-between-wrapper'>
-									<view class='name line1' style="width: 360rpx;"><text class="event_name event_bg">预售</text>{{item.cart_info.product.store_name}}</view>
-									<view class='num'><text class="p-color">￥{{item.cart_info.productPresellAttr.presell_price}}</text><br/>x {{item.product_num}}</view>
+									<view class='name line1' style="width: 360rpx;"><text
+											class="event_name event_bg">预售</text>{{item.cart_info.product.store_name}}
+									</view>
+									<view class='num'><text
+											class="p-color">￥{{item.cart_info.productPresellAttr.presell_price}}</text><br />x
+										{{item.product_num}}
+									</view>
 								</view>
-								<view class='attr line1' v-if="item.cart_info.productAttr.sku" style="margin-top: 0;">{{item.cart_info.productAttr.sku}}</view>
-								<view v-if="evaluate === 0 || evaluate === 10 || evaluate === 11" class="event_ship event_color">发货时间：
+								<view class='attr line1' v-if="item.cart_info.productAttr.sku" style="margin-top: 0;">
+									{{item.cart_info.productAttr.sku}}
+								</view>
+								<view v-if="evaluate === 0 || evaluate === 10 || evaluate === 11"
+									class="event_ship event_color">发货时间：
 									<!--全款预售-->
-									<text v-if="item.cart_info.productPresell.presell_type === 1">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
+									<text
+										v-if="item.cart_info.productPresell.presell_type === 1">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
 									<!--定金预售-->
-									<text v-if="item.cart_info.productPresell.presell_type === 2">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
-								</view>	
+									<text
+										v-if="item.cart_info.productPresell.presell_type === 2">{{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内</text>
+								</view>
 								<view class="right-btn-box event_box">
-									<view class="btn-item" v-if="item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
-									<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
-									<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
-									<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.is_refund==0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
+									<view class="btn-item"
+										v-if="item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0"
+										@click.stop="refund(item)">申请退款</view>
+									<view class="btn-item err" v-if="item.is_refund ==1">退款中 x
+										{{item.product_num - item.refund_num}}
+									</view>
+									<view class='btn-item err' v-if="item.is_refund >1">已退款 x
+										{{item.product_num - item.refund_num}}
+									</view>
+									<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.is_refund==0'
+										@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 									<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
 								</view>
 							</view>
 						</view>
 					</view>
 					<view v-if="orderData.status >= 10" class="event_progress">
-						<view class="progress_list">									
+						<view class="progress_list">
 							<view class="progress_name">阶段一： 买家已付款</view>
-							<view class="progress_price">商品定金  <text class="align_right">￥{{ orderData.pay_price }}</text></view>
-							<view class="progress_pay">定金实付款<text class="align_right t-color">￥{{ orderData.pay_price }}</text></view>
+							<view class="progress_price">商品定金 <text
+									class="align_right">￥{{ orderData.pay_price }}</text></view>
+							<view class="progress_pay">定金实付款<text
+									class="align_right t-color">￥{{ orderData.pay_price }}</text></view>
 						</view>
 						<view class="progress_list">
-							<view class="progress_name">阶段二： 
-								<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 0">未开始</text>
-								<text v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 1">等待买家付尾款</text>
-								<text v-if="orderData.status == 11 || orderData.presellOrder.activeStatus == 2">交易已关闭</text>
+							<view class="progress_name">阶段二：
+								<text
+									v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 0">未开始</text>
+								<text
+									v-if="orderData.status == 10 && orderData.presellOrder.activeStatus == 1">等待买家付尾款</text>
+								<text
+									v-if="orderData.status == 11 || orderData.presellOrder.activeStatus == 2">交易已关闭</text>
 							</view>
-							<view class="progress_price">商品尾款  <text class="align_right">￥{{ orderData.presellOrder.pay_price }}</text></view>
-							<view class="progress_pay">尾款需付款<text class="align_right t-color">￥{{ orderData.presellOrder.pay_price }}</text></view>
+							<view class="progress_price">商品尾款 <text
+									class="align_right">￥{{ orderData.presellOrder.pay_price }}</text></view>
+							<view class="progress_pay">尾款需付款<text
+									class="align_right t-color">￥{{ orderData.presellOrder.pay_price }}</text></view>
 						</view>
 					</view>
 				</view>
 				<view v-else class='item'>
 					<view class="acea-row row-between-wrapper">
 						<view class='pictrue' @click="jumpCon(item)">
-							<image :src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image' ></image>
+							<image
+								:src='(item.cart_info.productAttr && item.cart_info.productAttr.image) || item.cart_info.product.image'>
+							</image>
 						</view>
 						<view class='text'>
-								<view class='acea-row row-between-wrapper'>
-									<view class='name line1'><text v-if="item.product_type != 0 && item.product_type != 10" :class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>{{item.cart_info.product.store_name}}</view>
-									<view class='num'>x {{item.product_num}}</view>
-								</view>
-								<view class='attr line1' v-if="item.cart_info.productAttr.sku">{{item.cart_info.productAttr.sku}}</view>
-								<view class='money p-color' v-if="item.cart_info.product_type ==3">￥{{item.cart_info.productAssistAttr.assist_price}}</view>
-								<view class='money p-color' v-else-if="item.cart_info.product_type ==4">￥{{item.cart_info.activeSku.active_price}}</view>
-								<view class='money acea-row row-middle' v-else>
-									<text>￥{{item.cart_info.productAttr.price}}</text>
-									<image v-if="item.cart_info.productAttr.show_svip_price" class="svip-img" src="/static/images/svip.png"></image>
+							<view class='acea-row row-between-wrapper'>
+								<view class='name line1'><text v-if="item.product_type != 0 && item.product_type != 10"
+										:class="'font_bg-red type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>{{item.cart_info.product.store_name}}
 								</view>
+								<view class='num'>x {{item.product_num}}</view>
+							</view>
+							<view class='attr line1' v-if="item.cart_info.productAttr.sku">
+								{{item.cart_info.productAttr.sku}}
+							</view>
+							<view class='money p-color' v-if="item.cart_info.product_type ==3">
+								￥{{item.cart_info.productAssistAttr.assist_price}}</view>
+							<view class='money p-color' v-else-if="item.cart_info.product_type ==4">
+								￥{{item.cart_info.activeSku.active_price}}</view>
+							<view class='money acea-row row-middle' v-else>
+								<text>￥{{item.cart_info.productAttr.price}}</text>
+								<image v-if="item.cart_info.productAttr.show_svip_price" class="svip-img"
+									src="/static/images/svip.png"></image>
+							</view>
 						</view>
 					</view>
 					<view class="right-btn-box">
-						<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
-						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
-						<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && orderData.refund_status&&orderData.status!=4 || orderData.status!=4&&item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
-						<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
+						<view class="btn-item err" v-if="item.is_refund ==1">退款中 x
+							{{item.product_num - item.refund_num}}
+						</view>
+						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}
+						</view>
+						<view class="btn-item"
+							v-if="item.is_refund ==0 && evaluate!=9 && orderData.refund_status&&orderData.status!=4 || orderData.status!=4&&item.refund_num > 0"
+							@click.stop="refund(item)">申请退款</view>
+						<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0'
+							@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 						<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
 					</view>
-				</view>	
+				</view>
 			</view>
 		</view>
 	</view>
@@ -93,10 +134,18 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { openOrderRefundSubscribe } from '@/utils/SubscribeMessage.js';
-	import { goShopDetail } from '@/libs/order.js'
-	import { initiateAssistApi } from '@/api/activity.js';
-	import { mapGetters } from "vuex";	
+	import {
+		openOrderRefundSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		initiateAssistApi
+	} from '@/api/activity.js';
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
 		props: {
 			evaluate: {
@@ -131,14 +180,14 @@
 		computed: mapGetters(['viewColor']),
 		data() {
 			return {
-				totalNmu:'',
+				totalNmu: '',
 				isTimePay: false, //是否到支付时间
 			};
 		},
-		watch:{
-			cartInfo:function(nVal,oVal){
+		watch: {
+			cartInfo: function(nVal, oVal) {
 				let num = 0
-				nVal.forEach((item,index)=>{
+				nVal.forEach((item, index) => {
 					num += item.cart_num
 				})
 				this.totalNmu = num
@@ -149,79 +198,105 @@
 		},
 		mounted() {},
 		methods: {
-			evaluateTap:function(unique,orderId){
+			evaluateTap: function(unique, orderId) {
 				uni.navigateTo({
-					url:`/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}`
+					url: `/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}`
 				})
 			},
 			// 判断是否到支付尾款时间
-			isPayBalance(){
+			isPayBalance() {
 				let that = this;
-				if(that.orderData.status === 10){
-					if(new Date() < new Date(that.orderData.presellOrder.final_start_time)){
+				if (that.orderData.status === 10) {
+					if (new Date() < new Date(that.orderData.presellOrder.final_start_time)) {
 						that.isTimePay = false; //未开始
-					}else if((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <= new Date(that.orderData.presellOrder.final_start_time)) ){
+					} else if ((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <=
+							new Date(that.orderData.presellOrder.final_start_time))) {
 						that.isTimePay = true; //立即支付
 					}
 				}
 			},
-			jumpCon:function(item){
-				if(item.product_type == 4)item.activity_id = item.cart_info && item.cart_info.activeSku.product_group_id
-				if(item.product_type == 3)item.activity_id = item.cart_info && item.cart_info.productAssistAttr.product_assist_id
+			jumpCon: function(item) {
+				if (item.product_type == 4) item.activity_id = item.cart_info && item.cart_info.activeSku
+					.product_group_id
+				if (item.product_type == 3) item.activity_id = item.cart_info && item.cart_info.productAssistAttr
+					.product_assist_id
 				goShopDetail(item).then(res => {
 					initiateAssistApi(item.activity_id).then(res => {
 						let id = res.data.product_assist_set_id;
+						uni.hideLoading();
+						// #ifndef MP
+						uni.navigateTo({
+							url: '/pages/activity/assist_detail/index?id=' + id
+						});
+						// #endif
+						// #ifdef MP
+						openBargainSubscribe().then(res => {
 							uni.hideLoading();
-							// #ifndef MP
 							uni.navigateTo({
 								url: '/pages/activity/assist_detail/index?id=' + id
 							});
-							// #endif
-							// #ifdef MP
-							openBargainSubscribe().then(res => {
-								uni.hideLoading();
-								uni.navigateTo({
-									url: '/pages/activity/assist_detail/index?id=' + id
-								});
-							}).catch((err) => {
-								uni.hideLoading();
-							});
-							// #endif					
 						}).catch((err) => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})	
+							uni.hideLoading();
+						});
+						// #endif					
+					}).catch((err) => {
+						uni.showToast({
+							title: err,
+							icon: 'none'
+						})
 					});
-				})	
+				})
 			},
 			// 退款
-			refund(item){  
+			refund(item) {
+				let that = this;
 				// #ifdef MP
 				openOrderRefundSubscribe().then(() => {
 					uni.hideLoading();
-					if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1){	
-						uni.navigateTo({
-							url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type
-						})
-					}else{
-						uni.navigateTo({
-							url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id
+					if (that.orderData.is_percentage==1) {
+						uni.showToast({
+							title: '请联系客服',
+							icon:'error'
 						})
+					} else {
+						if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) {
+							uni.navigateTo({
+								url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' +
+									'&ids=' + item.order_product_id + '&refund_type=1&order_type=' + this
+									.orderData.order_type
+							})
+						} else {
+							uni.navigateTo({
+								url: '/pages/users/refund/select?order_id=' + this.orderId +
+									'&type=1&order_type=' + this.orderData.order_type + '&ids=' + item
+									.order_product_id
+							})
+						}
 					}
 				}).catch(() => {
 					uni.hideLoading();
 				})
 				// #endif
 				// #ifdef H5 || APP-PLUS
-				if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1){					
-					uni.navigateTo({
-						url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type
-					})
-				}else{
-					uni.navigateTo({
-						url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id
+				if (that.orderData.is_percentage==1) {
+					uni.showToast({
+						title: '请联系客服',
+						icon:'error'
 					})
+				} else {
+					if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) {
+						uni.navigateTo({
+							url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + '&ids=' +
+								item
+								.order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/users/refund/select?order_id=' + this.orderId + '&type=1&order_type=' +
+								this
+								.orderData.order_type + '&ids=' + item.order_product_id
+						})
+					}
 				}
 				// #endif
 			}
@@ -233,83 +308,101 @@
 	.orderGoods {
 		background-color: #fff;
 	}
+
 	.p-color {
 		color: var(--view-priceColor);
 	}
-	.t-color{
+
+	.t-color {
 		color: var(--view-theme);
 	}
-	.svip-img{
+
+	.svip-img {
 		width: 65rpx;
 		height: 28rpx;
 		margin: 4rpx 0 0 4rpx;
 	}
-	.title{
+
+	.title {
 		height: 86rpx;
 		position: relative;
 		padding: 0 30rpx;
-		&::after{
+
+		&::after {
 			content: "";
 			width: 750rpx;
-			border-bottom: 2rpx dotted #D8D8D8; 
+			border-bottom: 2rpx dotted #D8D8D8;
 			position: absolute;
 			bottom: 0;
 			left: 0;
 		}
-		.item-status{
+
+		.item-status {
 			color: #999999;
 			font-size: 30rpx;
-			&.status0{
+
+			&.status0 {
 				color: #2291F8;
 			}
 		}
-		.item-date{
+
+		.item-date {
 			color: #666666;
 			font-size: 28rpx;
 		}
-		}
-	.right-btn-box{
+	}
+
+	.right-btn-box {
 		display: flex;
 		align-items: center;
 		justify-content: flex-end;
-		&.event_box{
+
+		&.event_box {
 			position: static;
 		}
-		.btn-item{
+
+		.btn-item {
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			width:140rpx;
-			height:46rpx;
+			width: 140rpx;
+			height: 46rpx;
 			margin-left: 10rpx;
-			border:1px solid rgba(187,187,187,1);
-			border-radius:23rpx;
+			border: 1px solid rgba(187, 187, 187, 1);
+			border-radius: 23rpx;
 			font-size: 24rpx;
 			color: #282828;
-			&.on{
-				background:rgba(220,220,220,1);
-				border-color: rgba(220,220,220,1);
+
+			&.on {
+				background: rgba(220, 220, 220, 1);
+				border-color: rgba(220, 220, 220, 1);
 			}
-			&.err{
-				background:rgba(247,247,247,1);
-				border-color: rgba(247,247,247,1);
+
+			&.err {
+				background: rgba(247, 247, 247, 1);
+				border-color: rgba(247, 247, 247, 1);
 				color: #AAAAAA;
 			}
 		}
 	}
-	.event_bg{
+
+	.event_bg {
 		background: #FF7F00;
 	}
-	.event_color{
+
+	.event_color {
 		color: #FF7F00;
 	}
-	.presell_item{
+
+	.presell_item {
 		height: auto;
 		padding-bottom: 15rpx;
 	}
-	.event_progress{
+
+	.event_progress {
 		margin-top: 20rpx;
 		background: #fff;
+
 		.progress_name {
 			padding-left: 30rpx;
 			height: 60rpx;
@@ -318,7 +411,8 @@
 			font-weight: bold;
 			position: relative;
 			color: var(--view-theme);
-			&::before{
+
+			&::before {
 				content: "";
 				display: inline-block;
 				width: 5rpx;
@@ -329,43 +423,49 @@
 				left: 0;
 			}
 		}
-		.align_right{
+
+		.align_right {
 			float: right;
 			font-weight: bold;
 		}
-		.progress_price{
+
+		.progress_price {
 			padding: 20rpx 30rpx;
 			color: #999999;
 			font-size: 22rpx;
 		}
-		.progress_pay{
+
+		.progress_pay {
 			padding: 25rpx 30rpx;
 			background: var(--view-minorColor);
 			font-size: 26rpx;
 			color: #282828;
 		}
 	}
-	.event_name{
+
+	.event_name {
 		display: inline-block;
 		margin-right: 9rpx;
 		color: #fff;
 		font-size: 20rpx;
 		padding: 0 8rpx;
-		line-height: 30rpx;	
+		line-height: 30rpx;
 		text-align: center;
-		border-radius: 6rpx;						
+		border-radius: 6rpx;
 	}
-	.event_ship{
+
+	.event_ship {
 		font-size: 20rpx;
-		margin-top: 10rpx;						
+		margin-top: 10rpx;
 	}
-	.goodWrapper.item1{
-		&::after{
+
+	.goodWrapper.item1 {
+		&::after {
 			content: "";
 			display: block;
 			width: 750rpx;
 			height: 14rpx;
 			background: #F0F0F0;
-		}			
+		}
 	}
-</style>
+</style>

uni-app/config/app.js

@@ -10,12 +10,13 @@ let openPlantGrass = '-openPlantGrass-'
 // let httpApi = 'https://multi-merchant.hdlkeji.com' //测试
 // let httpApi = 'https://crmeb.hdlkeji.com/' //测试
 let httpApi = 'https://hongbaomi.com' //生产
+// let httpApi = 'https://hbm.hdlkeji.com' //生产
 // let httpApi = 'https://mer1.crmeb.net' //生产
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 // let wsApi = 'ws://192.168.3.20:8324'
-// let wsApi = 'wss://mer1.crmeb.net'
-let wsApi = 'wss://hongbaomi.com'
+let wsApi = 'wss://mer1.crmeb.net'
+// let wsApi = 'https://hbm.hdlkeji.com'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
@@ -48,4 +49,4 @@ module.exports = {
 	TOKENNAME: 'X-Token',
 	// 缓存时间 0 永久
 	EXPIRE: 0,
-};
+};

uni-app/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "CRMEB",
-    "appid" : "__UNI__A34A894",
+    "appid" : "__UNI__5C95D62",
     "description" : "",
     "versionName" : "1.0.4",
     "versionCode" : 127,

uni-app/pages/users/order_list/index.vue

@@ -189,12 +189,13 @@
 									最晚付款时间：{{item.expire_time}}
 								</view>
 								<view class="fenxiao bottom">
-									<view class="" style="display: flex;align-items: center;" @click.stop="toPurchase" v-show="orderStatus==5">
-										<text>分销详情</text>
+									<view class="" style="display: flex;align-items: center;" @click.stop="toPurchase"
+										v-show="orderStatus==5">
+										<text>分销拓展抵扣详情</text>
 										<text class='bnt b-color' style="margin-left: 20rpx;">分享</text>
 									</view>
 									<view class="" v-show="orderStatus!=5">
-										
+
 									</view>
 									<view class='bottom acea-row row-right row-middle'>
 										<view class='bnt b-color'
@@ -256,7 +257,7 @@
 												<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
 												<view>x{{goods.product_num}}</view>
 											</view>
-											
+
 										</view>
 									</view>
 								</view>
@@ -291,7 +292,7 @@
 												<view>￥{{goods.cart_info.productAttr.price}}</view>
 												<view>x{{goods.product_num}}</view>
 											</view>
-											
+
 										</view>
 									</view>
 								</view>
@@ -313,34 +314,42 @@
 											按{{100-item.start_percentage}}%付款
 										</view>
 									</view>
-									<view class='totalPrice' style="flex: 1;"
-										>
+									<view class='totalPrice' style="flex: 1;">
 										共{{item.total_num || 0}}件商品，<text>{{item.is_percentage==1&&item.status!=0?'实付款':'总金额'}}</text>
 										<text class='money p-color'>￥{{item.pay_price}}</text>
 									</view>
 								</view>
-								<view class='totalPrice' style="flex: 1;" v-show="item.is_percentage==1&&item.status==4">
+								<view class='totalPrice' style="flex: 1;"
+									v-show="item.is_percentage==1&&item.status==4">
 									最晚付尾款时间：{{item.expire_time}}
 								</view>
-								<view class="fenxiao bottom" v-if="item.is_percentage==1&&item.status==4||item.status!=4&&item.status!=0&&item.status!=1&&item.status!=2&&item.status!=-1&&item.status!=3">
-									<view class="" style="display: flex;align-items: center;" @click.stop="toPurchase(item.order_id)" v-show="item.is_percentage==1&&item.status==4||item.status==5">
-										<text>分销详情</text>
-										<button  @click.stop="share(item)" class='bnt b-color' style="margin-left: 20rpx;">分享</button>
+								<view class="fenxiao bottom"
+									v-if="item.is_percentage==1&&item.status==4||item.status!=4&&item.status!=0&&item.status!=1&&item.status!=2&&item.status!=-1&&item.status!=3">
+									<view class="" style="display: flex;align-items: center;"
+										@click.stop="toPurchase(item.order_id)"
+										v-show="item.is_percentage==1&&item.status==4||item.status==5">
+										<text>分销拓展抵扣详情</text>
+										<button @click.stop="share(item)" class='bnt b-color'
+											style="margin-left: 20rpx;">分享</button>
 									</view>
-									
-									<view class='bottom acea-row row-right row-middle' v-if="item.status!=4&&item.status!=0&&item.status!=5">
-										<view class='bnt b-color' 
+
+									<view class='bottom acea-row row-right row-middle'
+										v-if="item.status!=4&&item.status!=0&&item.status!=5">
+										<view class='bnt b-color'
 											@click.stop='goPay(item.pay_price,item.group_order_id)'>
 											惠拓购付款</view>
 									</view>
-									<view class='bottom acea-row row-right row-middle' v-show="item.is_percentage==1&&item.status==4||item.status==5">
+									<view class='bottom acea-row row-right row-middle'
+										v-show="item.is_percentage==1&&item.status==4||item.status==5">
 										<view class='bnt b-color' style="white-space: nowrap;"
 											@click.stop='goFinalPay(item.pay_price,item.order_id)'>
-											支付尾款(￥{{((item.total_price*1+item.pay_postage*1) * item.residue_percentage) / 100>0?(item.total_price*(item.residue_percentage) / 100).toFixed(2):0}})</view>
+											支付尾款(￥{{((item.total_price*1+item.pay_postage*1) * item.residue_percentage) / 100>0?(item.total_price*(item.residue_percentage) / 100).toFixed(2):0}})
+										</view>
 									</view>
 								</view>
 							</view>
-							<view class='bottom acea-row row-right row-middle' v-if="orderStatus!=5&&item.status!=4&&item.status!=5">
+							<view class='bottom acea-row row-right row-middle'
+								v-if="orderStatus!=5&&item.status!=4&&item.status!=5">
 								<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
 									@click.stop='applyInvoice(item.order_id)'>申请开票</view>
 								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
@@ -388,20 +397,20 @@
 		</view>
 		<home></home>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<payment @finalPay='finalPay' ref="payment" :payMode='payMode' :isFinal="isFinal" :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
-			:totalPrice='totalPrice'></payment>
+		<payment @finalPay='finalPay' ref="payment" :payMode='payMode' :isFinal="isFinal" :pay_close="pay_close"
+			@onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
 		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
 		<uni-popup ref="popup" type="center">
-			 <view class="popup" v-if="Object.keys(shareInfo).length!=0">
-			 	<view class="image">
-			 		<image :src='shareInfo.orderProduct[0].cart_info.product.image'></image>
-			 	</view>
+			<view class="popup" v-if="Object.keys(shareInfo).length!=0">
+				<view class="image">
+					<image :src='shareInfo.orderProduct[0].cart_info.product.image'></image>
+				</view>
 				<view class="title">
 					<view>{{shareInfo.orderProduct[0].cart_info.product.store_name}}</view>
 					<view class="price">￥{{shareInfo.orderProduct[0].cart_info.productAttr.price}}</view>
 				</view>
 				<button class="copybutton" @click="copyText">点击复制链接</button>
-			 </view>
+			</view>
 		</uni-popup>
 	</view>
 </template>
@@ -444,7 +453,9 @@
 	import {
 		configMap
 	} from '@/utils'
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	export default {
 		components: {
 			payment,
@@ -453,15 +464,15 @@
 			authorize,
 			addInvoicing
 		},
-		
+
 		onLoad() {
 
 
 		},
 		data() {
 			return {
-				shareInfo:{},
-				isFinal:false,
+				shareInfo: {},
+				isFinal: false,
 				statusBarHeight: 0,
 				loading: false, //是否加载中
 				loadend: false, //是否加载完毕
@@ -546,42 +557,42 @@
 		onReady() {},
 		mounted: function() {},
 		methods: {
-			
-			copyText(){
-				let that=this
-				let data=HTTP_REQUEST_URL+'/pages/index/index?order_id='+this.order_id
+
+			copyText() {
+				let that = this
+				let data = HTTP_REQUEST_URL + '/pages/index/index?order_id=' + this.order_id
 				// let data='http://192.168.2.56:8080'+'/pages/index/index?order_id='+this.order_id
 				uni.setClipboardData({
 					data: data,
-					success: function () {
+					success: function() {
 						uni.showToast({
-							title:'已复制'
+							title: '已复制'
 						})
 						that.$refs.popup.close()
 					}
 				});
 
 			},
-			share(item){
-				this.shareInfo={}
-				this.order_id=item.order_id
-				uni.setStorageSync('order_id',item.order_id)
+			share(item) {
+				this.shareInfo = {}
+				this.order_id = item.order_id
+				uni.setStorageSync('order_id', item.order_id)
 				// #ifdef MP-WEIXIN
-				
-				uni.setStorageSync('isIntegral',true)
+
+				uni.setStorageSync('isIntegral', true)
 				uni.switchTab({
 					url: '/pages/index/index'
 				});
 				// #endif
 				// #ifdef H5
-				console.log(123,item)
-				this.shareInfo=item
+				console.log(123, item)
+				this.shareInfo = item
 				this.$refs.popup.open()
 				// #endif
 			},
 			toPurchase(id) {
 				uni.navigateTo({
-					url: '/pages/users/order_list/purchaseInfo?order_id='+id
+					url: '/pages/users/order_list/purchaseInfo?order_id=' + id
 				})
 			},
 			toBack() {
@@ -610,7 +621,7 @@
 			 *
 			 */
 			onChangeFun: function(e) {
-				console.log(1121,e)
+				console.log(1121, e)
 				let opt = e;
 				let action = opt.action || null;
 				let value = opt.value != undefined ? opt.value : null;
@@ -680,7 +691,7 @@
 			 *
 			 */
 			goPay: function(pay_price, order_id) {
-				this.isFinal=false
+				this.isFinal = false
 				this.$set(this, 'pay_close', true);
 				this.order_id = order_id;
 				this.pay_order_id = order_id.toString()
@@ -689,14 +700,14 @@
 			//尾款支付
 			goFinalPay: function(pay_price, order_id) {
 				console.log(this.$refs.payment)
-				this.isFinal=true
+				this.isFinal = true
 				this.$set(this, 'pay_close', true);
 				this.order_id = order_id;
 				this.pay_order_id = order_id.toString()
 				this.$set(this, 'totalPrice', pay_price);
 			},
-			finalPay(){
-					this.statusClick(1)
+			finalPay() {
+				this.statusClick(1)
 			},
 			/**
 			 * 支付成功回调
@@ -965,30 +976,35 @@
 </script>
 
 <style scoped lang="scss">
-	.popup{
+	.popup {
 		width: 500rpx;
 		height: auto;
 		background-color: #fff;
 		padding: 0 0 20rpx;
-		.image{
-			image{
+
+		.image {
+			image {
 				width: 500rpx;
 				height: 500rpx;
 			}
 		}
-		.title{
+
+		.title {
 			padding: 0 20rpx;
+
 			// display: flex;
 			// justify-content: space-between;
-			text{
+			text {
 				font-size: 20rpx;
 			}
-			.price{
+
+			.price {
 				color: #E93323;
 				font-weight: bold;
 			}
 		}
-		.copybutton{
+
+		.copybutton {
 			height: 76rpx;
 			border-radius: 38rpx;
 			margin: 30rpx 30rpx 0;
@@ -997,8 +1013,9 @@
 			line-height: 76rpx;
 			color: #FFFFFF;
 		}
-		
+
 	}
+
 	.fenxiao {
 		padding: 0 20rpx;
 		display: flex;
@@ -1289,7 +1306,7 @@
 	}
 
 	.my-order .list .item .bottom .bnt {
-		width: 210rpx;
+		// width: 200rpx;
 		height: 60rpx;
 		display: flex;
 		align-items: center;
@@ -1297,6 +1314,7 @@
 		color: #fff;
 		border-radius: 50rpx;
 		font-size: 27rpx;
+		padding:0 10px;
 	}
 
 	.my-order .list .item .bottom .bnt.cancelBnt {
@@ -1406,4 +1424,4 @@
 			font-size: 23rpx;
 		}
 	}
-</style>
+</style>