修复已知问题

crmeb/app/api/controller/v1/activity/StoreBargainController.php

@@ -67,7 +67,10 @@ class StoreBargainController
      */
     public function detail(Request $request, $id)
     {
-        $data = $this->services->getBargain($request, $id);
+        list($bargainUid) = $request->getMore([
+            ['bargainUid', 0]
+        ], true);
+        $data = $this->services->getBargain($request, $id, (int)$bargainUid);
         return app('json')->successful($data);
     }
 
@@ -100,9 +103,7 @@ class StoreBargainController
         list($bargainId) = $request->postMore([
             ['bargainId', 0]
         ], true);
-        $code = $this->services->setBargain($request->uid(), $bargainId);
-        if ($code === 'subscribe') return app('json')->fail('请先关注公众号', ['code' => 'subscribe']);
-        return app('json')->status($code, '参与成功');
+        return app('json')->successful($this->services->setBargain($request->uid(), $bargainId));
     }
 
     /**
@@ -120,49 +121,47 @@ class StoreBargainController
             ['bargainId', 0],
             ['bargainUserUid', 0]
         ], true);
-        $code = $this->services->setHelpBargain($request->uid(), $bargainId, $bargainUserUid);
-        if ($code === 'subscribe') return app('json')->fail('请先关注公众号', ['code' => 'subscribe']);
-        return app('json')->status($code, '砍价成功');
+        return app('json')->successful($this->services->setHelpBargain($request->uid(), $bargainId, $bargainUserUid));
     }
 
-    /**
-     * 砍价 砍掉金额
-     * @param Request $request
-     * @return mixed
-     */
-    public function help_price(Request $request)
-    {
-        list($bargainId, $bargainUserUid) = $request->postMore([
-            ['bargainId', 0],
-            ['bargainUserUid', 0]
-        ], true);
+//    /**
+//     * 砍价 砍掉金额
+//     * @param Request $request
+//     * @return mixed
+//     */
+//    public function help_price(Request $request)
+//    {
+//        list($bargainId, $bargainUserUid) = $request->postMore([
+//            ['bargainId', 0],
+//            ['bargainUserUid', 0]
+//        ], true);
+//
+//        /** @var StoreBargainUserHelpServices $bargainUserHelp */
+//        $bargainUserHelp = app()->make(StoreBargainUserHelpServices::class);
+//        $price = $bargainUserHelp->getPrice($request->uid(), (int)$bargainId, (int)$bargainUserUid);
+//        return app('json')->successful($price);
+//    }
 
-        /** @var StoreBargainUserHelpServices $bargainUserHelp */
-        $bargainUserHelp = app()->make(StoreBargainUserHelpServices::class);
-        $price = $bargainUserHelp->getPrice($request->uid(), (int)$bargainId, (int)$bargainUserUid);
-        return app('json')->successful($price);
-    }
-
-    /**
-     * 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
-     * @param Request $request
-     * @return mixed
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function help_count(Request $request)
-    {
-        list($bargainId, $bargainUserUid) = $request->postMore([
-            ['bargainId', 0],
-            ['bargainUserUid', 0]
-        ], true);
-        /** @var StoreBargainUserServices $bargainUserService */
-        $bargainUserService = app()->make(StoreBargainUserServices::class);
-        $data = $bargainUserService->helpCount($request, (int)$bargainId, (int)$bargainUserUid);
-        return app('json')->successful($data);
-    }
+//    /**
+//     * 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
+//     * @param Request $request
+//     * @return mixed
+//     * @throws \think\Exception
+//     * @throws \think\db\exception\DataNotFoundException
+//     * @throws \think\db\exception\ModelNotFoundException
+//     * @throws \think\exception\DbException
+//     */
+//    public function help_count(Request $request)
+//    {
+//        list($bargainId, $bargainUserUid) = $request->postMore([
+//            ['bargainId', 0],
+//            ['bargainUserUid', 0]
+//        ], true);
+//        /** @var StoreBargainUserServices $bargainUserService */
+//        $bargainUserService = app()->make(StoreBargainUserServices::class);
+//        $data = $bargainUserService->helpCount($request, (int)$bargainId, (int)$bargainUserUid);
+//        return app('json')->successful($data);
+//    }
 
 
     /**

crmeb/app/api/route/v1.php

@@ -44,9 +44,33 @@ Route::group(function () {
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\api\middleware\StationOpenMiddleware::class);
 
+
+//管理员订单操作类
+Route::group(function () {
+    Route::get('admin/order/statistics', 'v1.admin.StoreOrderController/statistics')->name('adminOrderStatistics');//订单数据统计
+    Route::get('admin/order/data', 'v1.admin.StoreOrderController/data')->name('adminOrderData');//订单每月统计数据
+    Route::get('admin/order/list', 'v1.admin.StoreOrderController/lst')->name('adminOrderList');//订单列表
+    Route::get('admin/refund_order/list', 'v1.admin.StoreOrderController/refundOrderList')->name('adminOrderRefundList');//退款订单列表
+    Route::get('admin/order/detail/:orderId', 'v1.admin.StoreOrderController/detail')->name('adminOrderDetail');//订单详情
+    Route::get('admin/refund_order/detail/:uni', 'v1.admin.StoreOrderController/refundOrderDetail')->name('RefundOrderDetail');//退款订单详情
+    Route::get('admin/order/delivery/gain/:orderId', 'v1.admin.StoreOrderController/delivery_gain')->name('adminOrderDeliveryGain');//订单发货获取订单信息
+    Route::post('admin/order/delivery/keep/:id', 'v1.admin.StoreOrderController/delivery_keep')->name('adminOrderDeliveryKeep');//订单发货
+    Route::post('admin/order/price', 'v1.admin.StoreOrderController/price')->name('adminOrderPrice');//订单改价
+    Route::post('admin/order/remark', 'v1.admin.StoreOrderController/remark')->name('adminOrderRemark');//订单备注
+    Route::post('admin/refund_order/remark', 'v1.admin.StoreOrderController/refundRemark')->name('refundRemark');//退款订单备注
+    Route::get('admin/order/time', 'v1.admin.StoreOrderController/time')->name('adminOrderTime');//订单交易额时间统计
+    Route::post('admin/order/offline', 'v1.admin.StoreOrderController/offline')->name('adminOrderOffline');//订单支付
+    Route::post('admin/order/refund', 'v1.admin.StoreOrderController/refund')->name('adminOrderRefund');//订单退款
+    Route::post('order/order_verific', 'v1.admin.StoreOrderController/order_verific')->name('order');//订单核销
+    Route::get('admin/order/delivery', 'v1.admin.StoreOrderController/getDeliveryAll')->name('getDeliveryAll');//获取配送员
+    Route::get('admin/order/delivery_info', 'v1.admin.StoreOrderController/getDeliveryInfo')->name('getDeliveryInfo');//获取电子面单默认信息
+    Route::get('admin/order/export_temp', 'v1.admin.StoreOrderController/getExportTemp')->name('getExportTemp');//获取电子面单模板获取
+    Route::get('admin/order/export_all', 'v1.admin.StoreOrderController/getExportAll')->name('getExportAll');//获取物流公司
+})->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\api\middleware\StationOpenMiddleware::class)->middleware(\app\api\middleware\AuthTokenMiddleware::class, true)->middleware(\app\api\middleware\CustomerMiddleware::class);
+
 //会员授权接口
 Route::group(function () {
-    Route::post('order/order_verific', 'v1.admin.StoreOrderController/order_verific')->name('order');//订单核销
+
     //用户修改手机号
     Route::post('user/updatePhone', 'v1.LoginController/update_binding_phone')->name('updateBindingPhone');
     //设置登录code

crmeb/app/dao/activity/bargain/StoreBargainDao.php

@@ -107,19 +107,20 @@ class StoreBargainDao extends BaseDao
      * 砍价列表
      * @param int $page
      * @param int $limit
+     * @param string $field
      * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function bargainList(int $page, int $limit)
+    public function bargainList(int $page, int $limit, string $field = '*')
     {
         return $this->search(['is_del' => 0, 'status' => 1])
             ->where('start_time', '<=', time())
             ->where('stop_time', '>=', time())
             ->where('product_id', 'IN', function ($query) {
                 $query->name('store_product')->where('is_show', 1)->where('is_del', 0)->field('id');
-            })->with('product')->page($page, $limit)->order('sort DESC,id DESC')->select()->toArray();
+            })->with('product')->field($field)->page($page, $limit)->order('sort DESC,id DESC')->select()->toArray();
     }
 
     /**
@@ -132,7 +133,8 @@ class StoreBargainDao extends BaseDao
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function DiyBargainList(array $where,int $page, int $limit){
+    public function DiyBargainList(array $where, int $page, int $limit)
+    {
         return $this->search($where)
             ->when(isset($where['sid']) && $where['sid'], function ($query) use ($where) {
                 $query->whereIn('id', function ($query) use ($where) {
@@ -161,7 +163,8 @@ class StoreBargainDao extends BaseDao
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getHomeList(array $where,int $page, int $limit){
+    public function getHomeList(array $where, int $page, int $limit)
+    {
         return $this->search($where)
             ->when(isset($where['sid']) && $where['sid'], function ($query) use ($where) {
                 $query->whereIn('id', function ($query) use ($where) {
@@ -229,6 +232,7 @@ class StoreBargainDao extends BaseDao
                 $query->name('store_product')->where('is_show', 1)->where('is_del', 0)->field('id');
             })->count();
     }
+
     /**
      * 修改砍价状态
      * @param int $id

crmeb/app/services/activity/bargain/StoreBargainServices.php

@@ -305,55 +305,55 @@ class StoreBargainServices extends BaseServices
         return $valueNew;
     }
 
-    /**
-     * TODO 获取砍价表ID
-     * @param int $bargainId $bargainId 砍价商品
-     * @param int $bargainUserUid $bargainUserUid  开启砍价用户编号
-     * @param int $status $status  砍价状态 1参与中 2 活动结束参与失败 3活动结束参与成功
-     * @return mixed
-     */
-    public function getBargainUserTableId($bargainId = 0, $bargainUserUid = 0)
-    {
-        return $this->dao->value(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], 'id');
-    }
+//    /**
+//     * TODO 获取砍价表ID
+//     * @param int $bargainId $bargainId 砍价商品
+//     * @param int $bargainUserUid $bargainUserUid  开启砍价用户编号
+//     * @param int $status $status  砍价状态 1参与中 2 活动结束参与失败 3活动结束参与成功
+//     * @return mixed
+//     */
+//    public function getBargainUserTableId($bargainId = 0, $bargainUserUid = 0)
+//    {
+//        return $this->dao->value(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], 'id');
+//    }
 
-    /**
-     * TODO 获取用户可以砍掉的价格
-     * @param $id $id 用户参与砍价表编号
-     * @return float
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function getBargainUserDiffPriceFloat($id)
-    {
-        $price = $this->dao->get($id, ['bargain_price,bargain_price_min']);
-        return (float)bcsub($price['bargain_price'], $price['bargain_price_min'], 2);
-    }
+//    /**
+//     * TODO 获取用户可以砍掉的价格
+//     * @param $id $id 用户参与砍价表编号
+//     * @return float
+//     * @throws \think\db\exception\DataNotFoundException
+//     * @throws \think\db\exception\ModelNotFoundException
+//     * @throws \think\exception\DbException
+//     */
+//    public function getBargainUserDiffPriceFloat($id)
+//    {
+//        $price = $this->dao->get($id, ['bargain_price,bargain_price_min']);
+//        return (float)bcsub($price['bargain_price'], $price['bargain_price_min'], 2);
+//    }
 
-    /**
-     * TODO 获取用户砍掉的价格
-     * @param int $id $id 用户参与砍价表编号
-     * @return float
-     */
-    public function getBargainUserPrice($id = 0)
-    {
-        return (float)$this->dao->value(['id' => $id], 'price');
-    }
+//    /**
+//     * TODO 获取用户砍掉的价格
+//     * @param int $id $id 用户参与砍价表编号
+//     * @return float
+//     */
+//    public function getBargainUserPrice($id = 0)
+//    {
+//        return (float)$this->dao->value(['id' => $id], 'price');
+//    }
 
-    /**
-     * 获取一条砍价商品
-     * @param int $bargainId
-     * @param string $field
-     * @return array
-     */
-    public function getBargainOne($bargainId = 0, $field = 'id,product_id,title,price,min_price,image')
-    {
-        if (!$bargainId) return [];
-        $bargain = $this->dao->getOne(['id' => $bargainId], $field);
-        if ($bargain) return $bargain->toArray();
-        else return [];
-    }
+//    /**
+//     * 获取一条砍价商品
+//     * @param int $bargainId
+//     * @param string $field
+//     * @return array
+//     */
+//    public function getBargainOne($bargainId = 0, $field = 'id,product_id,title,price,min_price,image')
+//    {
+//        if (!$bargainId) return [];
+//        $bargain = $this->dao->getOne(['id' => $bargainId], $field);
+//        if ($bargain) return $bargain->toArray();
+//        else return [];
+//    }
 
     /**
      * 砍价列表
@@ -364,7 +364,8 @@ class StoreBargainServices extends BaseServices
         /** @var StoreBargainUserServices $bargainUserService */
         $bargainUserService = app()->make(StoreBargainUserServices::class);
         [$page, $limit] = $this->getPageValue();
-        $list = $this->dao->BargainList($page, $limit);
+        $field = 'id,product_id,title,min_price,image,price';
+        $list = $this->dao->BargainList($page, $limit, $field);
         foreach ($list as &$item) {
             $item['people'] = $bargainUserService->getUserIdList($item['id']);
             $item['price'] = floatval($item['price']);
@@ -424,47 +425,84 @@ class StoreBargainServices extends BaseServices
         return $data;
     }
 
-    /**获取单条砍价
+    /**
+     * 前端获取砍价详情
      * @param Request $request
      * @param int $id
-     * @return mixed
+     * @param int $bargainUid
+     * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getBargain(Request $request, int $id)
+    public function getBargain(Request $request, int $id, int $bargainUid)
     {
+        /** @var StoreProductAttrServices $storeProductAttrServices */
+        $storeProductAttrServices = app()->make(StoreProductAttrServices::class);
+        /** @var StoreOrderServices $orderService */
+        $orderService = app()->make(StoreOrderServices::class);
+        /** @var StoreBargainUserServices $bargainUserService */
+        $bargainUserService = app()->make(StoreBargainUserServices::class);
+
+        //获取砍价商品信息
         $bargain = $this->dao->getOne(['id' => $id], '*', ['description']);
         if (!$bargain) throw new ValidateException('砍价商品不存在');
-        $this->dao->addBargain($id, 'look');
-        $bargain['time'] = time();
         if ($bargain['stop_time'] < time()) throw new ValidateException('砍价已结束');
+        list($productAttr, $productValue) = $storeProductAttrServices->getProductAttrDetail($id, $request->uid(), 0, 2, $bargain['product_id']);
+        foreach ($productValue as $v) {
+            $bargain['attr'] = $v;
+        }
+        $bargain['time'] = time();
+        $bargain = get_thumb_water($bargain);
+        $bargain['small_image'] = $bargain['image'];
+        $data['bargain'] = $bargain;
+
+        //写入查看和分享数据
+        $this->dao->addBargain($id, 'look');
+
+        //用户数据
         $user = $request->user();
         $data['userInfo']['uid'] = $user['uid'];
         $data['userInfo']['nickname'] = $user['nickname'];
         $data['userInfo']['avatar'] = $user['avatar'];
 
-        /** @var StoreProductAttrServices $storeProductAttrServices */
-        $storeProductAttrServices = app()->make(StoreProductAttrServices::class);
-        list($productAttr, $productValue) = $storeProductAttrServices->getProductAttrDetail($id, $user->uid, 0, 2, $bargain['product_id']);
-        foreach ($productValue as $v) {
-            $bargain['attr'] = $v;
+        //砍价数据
+        $userBargainInfo = $bargainUserService->helpCount($request, $id, $bargainUid);
+        //用户已经生成砍价订单的总数
+        $userBargainInfo['bargainOrderCount'] = $orderService->count(['bargain_id' => $id, 'uid' => $user['uid']]);
+        //用户砍价的总数
+        $userBargainInfo['bargainCount'] = $bargainUserService->count(['bargain_id' => $id, 'uid' => $user['uid'], 'is_del' => 0]);
+        //判断砍价状态
+        if (($userBargainInfo['bargainCount'] == 0 || $userBargainInfo['bargainCount'] == $userBargainInfo['bargainOrderCount']) //没有发起过砍价或者发起的砍价数量等于对应砍价商品的订单数量
+            && $bargain['people_num'] > $userBargainInfo['bargainCount'] //商品的可发起砍价数量大于已经发起过的砍价数量
+            && $userBargainInfo['price'] > 0 //剩余金额大于0
+            && $request->uid() == $bargainUid) { //是自己砍价
+            $userBargainInfo['bargainType'] = 1; //用户发起砍价
+        } elseif ($userBargainInfo['bargainCount'] > $userBargainInfo['bargainOrderCount'] //发起的砍价数量大于生成的订单数量
+            && $userBargainInfo['price'] > 0 //剩余金额大于0
+            && $request->uid() == $bargainUid) { //是自己砍价
+            $userBargainInfo['bargainType'] = 2; //发送给好友邀请砍价
+        } elseif ($userBargainInfo['userBargainStatus'] //用户可以砍价
+            && $userBargainInfo['price'] > 0 //剩余金额大于0
+            && $request->uid() != $bargainUid) { //不是自己的砍价
+            $userBargainInfo['bargainType'] = 3; //帮朋友砍价
+        } elseif ($userBargainInfo['userBargainStatus'] //用户可以砍价
+            && $userBargainInfo['price'] == 0 //剩余金额大于0
+            && $request->uid() != $bargainUid) { //不是自己的砍价
+            $userBargainInfo['bargainType'] = 4; //好友已经完成
+        } elseif (!$userBargainInfo['userBargainStatus'] //用户不可以砍价
+            && $request->uid() != $bargainUid) { //不是自己的砍价
+            $userBargainInfo['bargainType'] = 5; //已经帮好友砍价
+        } elseif ($userBargainInfo['price'] == 0 //剩余金额等于0
+            && $request->uid() == $bargainUid //是自己砍价
+            && $userBargainInfo['status'] != 3) { //未生成订单
+            $userBargainInfo['bargainType'] = 6; //立即支付
         }
-
-        $data['bargain'] = get_thumb_water($bargain);
-        $bargainNew = get_thumb_water($bargain, 'small');
-        $data['bargain']['small_image'] = $bargainNew['image'];
-
-        /** @var StoreOrderServices $orderService */
-        $orderService = app()->make(StoreOrderServices::class);
-        $data['bargainSumCount'] = $orderService->count(['bargain_id' => $id, 'uid' => $user['uid']]);
-
-        /** @var StoreBargainUserServices $bargainUserService */
-        $bargainUserService = app()->make(StoreBargainUserServices::class);
-        $data['userBargainStatus'] = $bargainUserService->count(['bargain_id' => $id, 'uid' => $user->uid, 'is_del' => 0]);
+        $data['userBargainInfo'] = $userBargainInfo;
 
         //用户访问事件
         event('user.userVisit', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']);
+
         //浏览记录
         ProductLogJob::dispatch(['visit', ['uid' => $user['uid'], 'product_id' => $bargain['product_id']]]);
         return $data;
@@ -535,7 +573,7 @@ class StoreBargainServices extends BaseServices
     }
 
     /**
-     * 参与砍价
+     * 发起砍价
      * @param int $uid
      * @param int $bargainId
      * @return string
@@ -558,35 +596,29 @@ class StoreBargainServices extends BaseServices
         /** @var StoreBargainUserServices $bargainUserService */
         $bargainUserService = app()->make(StoreBargainUserServices::class);
         $count = $bargainUserService->count(['bargain_id' => $bargainId, 'uid' => $uid, 'is_del' => 0, 'status' => 1]);
-        if ((int)sys_config('bargain_subscribe')) {
-            /** @var WechatServices $wechat */
-            $wechat = app()->make(WechatServices::class);
-            $subscribe = $wechat->get(['uid' => $uid, 'subscribe' => 1]);
-            if (!$subscribe) return 'subscribe';
-        }
         if ($count === false) {
             throw new ValidateException('参数错误');
-        } elseif ($count) {
-            return 'SUCCESSFUL';
         } else {
-            $count = $bargainUserService->count(['uid' => $uid, 'bargain_id' => $bargainId, 'type' => 1]);
+            /** @var StoreBargainUserHelpServices $bargainUserHelpService */
+            $bargainUserHelpService = app()->make(StoreBargainUserHelpServices::class);
+            $count = $bargainUserService->count(['uid' => $uid, 'bargain_id' => $bargainId, 'is_del' => 0]);
             if ($count >= $bargainInfo['num']) throw new ValidateException('您不能再发起此件商品砍价');
-            $res = $bargainUserService->setBargain($bargainId, $uid, $bargainInfo);
-        }
-        if (!$res) {
-            throw new ValidateException('参与失败');
-        } else {
-            return 'SUCCESS';
+            return $this->transaction(function () use ($bargainUserService, $bargainUserHelpService, $bargainId, $uid, $bargainInfo) {
+                $bargainUserInfo = $bargainUserService->setBargain($bargainId, $uid, $bargainInfo);
+                $price = $bargainUserHelpService->setBargainRecord($uid, $bargainUserInfo->toArray(), $bargainInfo);
+                return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price];
+            });
         }
     }
 
     /**
-     * @param Request $request
+     * 参与砍价
+     * @param int $uid
      * @param int $bargainId
      * @param int $bargainUserUid
-     * @return string
-     * @throws \think\Exception
+     * @return array
      * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function setHelpBargain(int $uid, int $bargainId, int $bargainUserUid)
@@ -600,32 +632,23 @@ class StoreBargainServices extends BaseServices
             ['id', '=', $bargainId],
         ]);
         if (!$bargainInfo) throw new ValidateException('砍价已结束');
-        if ((int)sys_config('bargain_subscribe')) {
-            /** @var WechatServices $wechat */
-            $wechat = app()->make(WechatServices::class);
-            $subscribe = $wechat->get(['uid' => $uid, 'subscribe' => 1]);
-            if (!$subscribe) return 'subscribe';
-        }
+        $bargainInfo = $bargainInfo->toArray();
         /** @var StoreBargainUserHelpServices $userHelpService */
         $userHelpService = app()->make(StoreBargainUserHelpServices::class);
         /** @var StoreBargainUserServices $bargainUserService */
         $bargainUserService = app()->make(StoreBargainUserServices::class);
         $bargainUserTableId = $bargainUserService->getBargainUserTableId($bargainId, $bargainUserUid);
         if (!$bargainUserTableId) throw new ValidateException('该分享未开启砍价');
+        $bargainUserInfo = $bargainUserService->get($bargainUserTableId)->toArray();
         $count = $userHelpService->isBargainUserHelpCount($bargainId, $bargainUserTableId, $uid);
-        if (!$count) return 'SUCCESSFUL';
-        $res = $userHelpService->setBargainUserHelp($bargainId, $bargainUserTableId, $uid);
-
-        if ($res) {
+        if (!$count) throw new ValidateException('您已经帮砍过此砍价');
+        $price = $userHelpService->setBargainRecord($uid, $bargainUserInfo, $bargainInfo);
+        if ($price) {
             if (!$bargainUserService->getSurplusPrice($bargainUserTableId, 1)) {
-                $bargainInfo = $this->dao->get($bargainId);//TODO 获取砍价商品信息
-                $bargainUserInfo = $bargainUserService->get($bargainUserTableId);// TODO 获取用户参与砍价信息
-                //用户发送消息
                 event('notice.notice', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
-
             }
-            return 'SUCCESS';
-        } else throw new ValidateException('砍价失败');
+        }
+        return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price];
     }
 
     /**
@@ -697,6 +720,7 @@ class StoreBargainServices extends BaseServices
     }
 
     /**
+     * 砍价分享
      * @param $bargainId
      * @param $user
      * @return bool|string

crmeb/app/services/activity/bargain/StoreBargainUserHelpServices.php

@@ -39,25 +39,25 @@ class StoreBargainUserHelpServices extends BaseServices
         $this->dao = $dao;
     }
 
-    /**
-     * TODO 获取用户还剩余的砍价金额
-     * @param int $bargainId $bargainId 砍价商品编号
-     * @param int $bargainUserUid $bargainUserUid 开启砍价用户编号
-     * @return float
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function getSurplusPrice($bargainId = 0, $bargainUserUid = 0)
-    {
-        /** @var StoreBargainServices $bargainUserService */
-        $bargainUserService = app()->make(StoreBargainServices::class);
-        $bargainUserTableId = $bargainUserService->getBargainUserTableId($bargainId, $bargainUserUid);// TODO 获取用户参与砍价表编号
-        $coverPrice = $bargainUserService->getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 获取用户可以砍掉的金额  好友砍价之后获取砍价金额
-        $alreadyPrice = $bargainUserService->getBargainUserPrice($bargainUserTableId);//TODO 用户已经砍掉的价格 好友砍价之后获取用户已经砍掉的价格
-        $surplusPrice = (float)bcsub((string)$coverPrice, (string)$alreadyPrice, 2);//TODO 用户剩余要砍掉的价格
-        return $surplusPrice;
-    }
+//    /**
+//     * TODO 获取用户还剩余的砍价金额
+//     * @param int $bargainId $bargainId 砍价商品编号
+//     * @param int $bargainUserUid $bargainUserUid 开启砍价用户编号
+//     * @return float
+//     * @throws \think\db\exception\DataNotFoundException
+//     * @throws \think\db\exception\ModelNotFoundException
+//     * @throws \think\exception\DbException
+//     */
+//    public function getSurplusPrice($bargainId = 0, $bargainUserUid = 0)
+//    {
+//        /** @var StoreBargainServices $bargainUserService */
+//        $bargainUserService = app()->make(StoreBargainServices::class);
+//        $bargainUserTableId = $bargainUserService->getBargainUserTableId($bargainId, $bargainUserUid);// TODO 获取用户参与砍价表编号
+//        $coverPrice = $bargainUserService->getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 获取用户可以砍掉的金额  好友砍价之后获取砍价金额
+//        $alreadyPrice = $bargainUserService->getBargainUserPrice($bargainUserTableId);//TODO 用户已经砍掉的价格 好友砍价之后获取用户已经砍掉的价格
+//        $surplusPrice = (float)bcsub((string)$coverPrice, (string)$alreadyPrice, 2);//TODO 用户剩余要砍掉的价格
+//        return $surplusPrice;
+//    }
 
     /**
      * 获取砍价帮列表
@@ -89,30 +89,30 @@ class StoreBargainUserHelpServices extends BaseServices
         return array_values($list);
     }
 
-    /**
-     * 获取砍价金额
-     * @param int $uid
-     * @param int $bargainId
-     * @param int $bargainUserUid
-     * @return array
-     */
-    public function getPrice(int $uid, int $bargainId, int $bargainUserUid)
-    {
-        if (!$bargainId || !$bargainUserUid) throw new ValidateException('参数错误');
-        /** @var StoreBargainUserServices $bargainUserService */
-        $bargainUserService = app()->make(StoreBargainUserServices::class);
-        $bargainUserTable = $bargainUserService->get(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], ['id', 'status', 'bargain_price_min', 'bargain_price', 'price']);//TODO 获取用户参与砍价表编号
-        if (!$bargainUserTable) {
-            throw new ValidateException('砍价信息没有查询到');
-        }
-        if (bcsub($bargainUserTable['bargain_price'], $bargainUserTable['price'], 2) == $bargainUserTable['bargain_price_min']) {
-            $status = true;
-        } else {
-            $status = false;
-        }
-        $price = $this->dao->value(['uid' => $uid, 'bargain_id' => $bargainId, 'bargain_user_id' => $bargainUserTable['id']], 'price');
-        return ['price' => $price, 'status' => $status];
-    }
+//    /**
+//     * 获取砍价金额
+//     * @param int $uid
+//     * @param int $bargainId
+//     * @param int $bargainUserUid
+//     * @return array
+//     */
+//    public function getPrice(int $uid, int $bargainId, int $bargainUserUid)
+//    {
+//        if (!$bargainId || !$bargainUserUid) throw new ValidateException('参数错误');
+//        /** @var StoreBargainUserServices $bargainUserService */
+//        $bargainUserService = app()->make(StoreBargainUserServices::class);
+//        $bargainUserTable = $bargainUserService->get(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], ['id', 'status', 'bargain_price_min', 'bargain_price', 'price']);//TODO 获取用户参与砍价表编号
+//        if (!$bargainUserTable) {
+//            throw new ValidateException('砍价信息没有查询到');
+//        }
+//        if (bcsub($bargainUserTable['bargain_price'], $bargainUserTable['price'], 2) == $bargainUserTable['bargain_price_min']) {
+//            $status = true;
+//        } else {
+//            $status = false;
+//        }
+//        $price = $this->dao->value(['uid' => $uid, 'bargain_id' => $bargainId, 'bargain_user_id' => $bargainUserTable['id']], 'price');
+//        return ['price' => $price, 'status' => $status];
+//    }
 
     /**
      * 判断是否能砍价
@@ -129,65 +129,54 @@ class StoreBargainUserHelpServices extends BaseServices
     }
 
     /**
-     * TODO 帮忙砍价
-     * @param int $bargainId
-     * @param int $bargainUserTableId
-     * @param int $uid
-     * @return bool
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
+     * 用户砍价，写入砍价记录
+     * @param $uid
+     * @param $bargainUserInfo
+     * @param $bargainInfo
+     * @return false|string
      */
-    public function setBargainUserHelp($bargainId, $bargainUserTableId, $uid)
+    public function setBargainRecord($uid, $bargainUserInfo, $bargainInfo)
     {
-        /** @var StoreBargainServices $bargainService */
-        $bargainService = app()->make(StoreBargainServices::class);
-        $bargainInfo = $bargainService->get($bargainId);
-
-        /** @var StoreBargainUserServices $bargainUserService */
-        $bargainUserService = app()->make(StoreBargainUserServices::class);
-        $alreadyPrice = $bargainUserService->value(['id' => $bargainUserTableId], 'price');//TODO 用户已经砍掉的价格
-
-        $people = $this->dao->count(['bargain_user_id' => $bargainUserTableId]);//已经参与砍价的人数
-
-        $coverPrice = bcsub((string)$bargainInfo->price, (string)$bargainInfo->min_price, 2);
-        $surplusPrice = bcsub((string)$coverPrice, (string)$alreadyPrice, 2);//TODO 用户剩余要砍掉的价格
-        if (0.00 === (float)$surplusPrice) return false;
-
-        $data['uid'] = $uid;
-        $data['bargain_id'] = $bargainId;
-        $data['bargain_user_id'] = $bargainUserTableId;
-        if (($bargainInfo->people_num - $people) == 1) {
-            $data['price'] = $surplusPrice;
+        //已经参与砍价的人数
+        $people = $this->dao->count(['bargain_user_id' => $bargainUserInfo['id']]);
+        //剩余砍价金额
+        $coverPrice = bcsub((string)$bargainUserInfo['bargain_price'], (string)$bargainUserInfo['bargain_price_min'], 2);
+        $surplusPrice = bcsub((string)$coverPrice, (string)$bargainUserInfo['price'], 2);//TODO 用户剩余要砍掉的价格
+        if (0.00 === (float)$surplusPrice) throw new ValidateException('砍价已结束');
+        if (($bargainInfo['people_num'] - $people) == 1) {
+            $price = $surplusPrice;
         } else {
             /** @var UserServices $userServices */
             $userServices = app()->make(UserServices::class);
             $userInfo = $userServices->get($uid);
-            $data['price'] = $this->randomFloat($surplusPrice, $bargainInfo->people_num - $people, $userInfo->add_time == $userInfo->last_time && !$this->dao->count(['uid' => $uid]));
+            $price = $this->randomFloat($surplusPrice, $bargainInfo['people_num'] - $people, $userInfo->add_time == $userInfo->last_time && !$this->dao->count(['uid' => $uid]));
         }
-        $data['add_time'] = time();
-        if ($bargainUserService->value(['id' => $bargainUserTableId], 'uid') == $uid) {
-            $data['type'] = 1;
+        $allPrice = bcadd((string)$bargainUserInfo['price'], (string)$price, 2);
+        if ($bargainUserInfo['uid'] == $uid) {
+            $type = 1;
         } else {
             //帮砍次数限制
-            $count = $this->dao->count(['uid' => $uid, 'bargain_id' => $bargainId, 'type' => 0]);
-            if ($count >= $bargainInfo->bargain_num) throw new ValidateException('您不能再帮砍此件商品');
-            $data['type'] = 0;
+            $count = $this->dao->count(['uid' => $uid, 'bargain_id' => $bargainInfo['id'], 'type' => 0]);
+            if ($count >= $bargainInfo['bargain_num']) throw new ValidateException('您不能再帮砍此件商品');
+            $type = 0;
         }
-
-        $price = bcadd((string)$alreadyPrice, (string)$data['price'], 2);
-        $bargainUserData['price'] = $price;
-        return $this->transaction(function () use ($bargainUserService, $bargainUserTableId, $bargainUserData, $data) {
-            $res1 = $bargainUserService->update($bargainUserTableId, $bargainUserData);
-            $res2 = $this->dao->save($data);
-            $res = $res1 && $res2;
-            if (!$res) throw new ValidateException('砍价失败');
-            return $res;
-        });
-
+        /** @var StoreBargainUserServices $bargainUserService */
+        $bargainUserService = app()->make(StoreBargainUserServices::class);
+        $res1 = $bargainUserService->update($bargainUserInfo['id'], ['price' => $allPrice]);
+        $res2 = $this->dao->save([
+            'uid' => $uid,
+            'bargain_id' => $bargainInfo['id'],
+            'bargain_user_id' => $bargainUserInfo['id'],
+            'price' => $price,
+            'add_time' => time(),
+            'type' => $type,
+        ]);
+        $res = $res1 && $res2;
+        if (!$res) throw new ValidateException('砍价失败');
+        return $price;
     }
 
+
     /**
      * 随机金额
      * @param $price

crmeb/app/services/order/StoreOrderServices.php

@@ -1532,7 +1532,7 @@ HTML;
         $data['bargain_id'] = $bargain_id;
         $data['advance_id'] = $advance_id;
         $data['cartInfo'] = $cartGroup['cartInfo'];
-        $data['custom_form'] = json_decode($cartGroup['cartInfo'][0]['productInfo']['custom_form'], true);
+        $data['custom_form'] = json_decode($cartGroup['cartInfo'][0]['productInfo']['custom_form'], true) ?? [];
         $data['priceGroup'] = $priceGroup;
         $data['orderKey'] = $this->cacheOrderInfo($user['uid'], $validCartInfo, $priceGroup, $other);
         $data['offlinePostage'] = $other['offlinePostage'];

crmeb/app/services/system/config/SystemConfigServices.php

@@ -100,15 +100,15 @@ class SystemConfigServices extends BaseServices
             ],
             'show_value' => 1
         ],
-//        'pay_success_printing_switch' => [
-//            'son_type' => [
-//                'develop_id' => '',
-//                'printing_api_key' => '',
-//                'printing_client_id' => '',
-//                'terminal_number' => '',
-//            ],
-//            'show_value' => 1
-//        ],
+        'pay_success_printing_switch' => [
+            'son_type' => [
+                'develop_id' => '',
+                'printing_api_key' => '',
+                'printing_client_id' => '',
+                'terminal_number' => '',
+            ],
+            'show_value' => 1
+        ],
         'wss_open' => [
             'son_type' => [
                 'wss_local_cert' => '',
@@ -138,18 +138,18 @@ class SystemConfigServices extends BaseServices
             ],
             'show_value' => 1
         ],
-//        'system_product_copy_type' => [
-//            'son_type' => [
-//                'copy_product_apikey' => '',
-//            ],
-//            'show_value' => 2
-//        ],
-//        'logistics_type' => [
-//            'son_type' => [
-//                'system_express_app_code' => '',
-//            ],
-//            'show_value' => 2
-//        ],
+        'system_product_copy_type' => [
+            'son_type' => [
+                'copy_product_apikey' => '',
+            ],
+            'show_value' => 2
+        ],
+        'logistics_type' => [
+            'son_type' => [
+                'system_express_app_code' => '',
+            ],
+            'show_value' => 2
+        ],
         'ali_pay_status' => [
             'son_type' => [
                 'ali_pay_appid' => '',
@@ -168,15 +168,15 @@ class SystemConfigServices extends BaseServices
             ],
             'show_value' => 1
         ],
-//        'config_export_open' => [
-//            'son_type' => [
-//                'config_export_to_name' => '',
-//                'config_export_to_tel' => '',
-//                'config_export_to_address' => '',
-//                'config_export_siid' => '',
-//            ],
-//            'show_value' => 1
-//        ],
+        'config_export_open' => [
+            'son_type' => [
+                'config_export_to_name' => '',
+                'config_export_to_tel' => '',
+                'config_export_to_address' => '',
+                'config_export_siid' => '',
+            ],
+            'show_value' => 1
+        ],
         'image_watermark_status' => [
             'son_type' => [
                 'watermark_type' => [

crmeb/public/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>加载中</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.51373553.js></script><script src=/static/js/index.3719ecc1.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b8c5c46d.js></script><script src=/static/js/index.6052499b.js></script></body></html>

crmeb/public/statics/mp_view/components/addressWindow/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/couponListWindow/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/couponWindow/index.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/components/kefuIcon/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/payment/index.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/components/update/app-update.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/update/app-update"],{"0207":function(t,e,n){"use strict";var i=n("0584"),a=n.n(i);a.a},"0584":function(t,e,n){},4600:function(t,e,n){"use strict";n.r(e);var i=n("aedc"),a=n("9430");for(var o in a)"default"!==o&&function(t){n.d(e,t,(function(){return a[t]}))}(o);n("0207");var u,r=n("f0c5"),s=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,"57641fdc",null,!1,i["a"],u);e["default"]=s.exports},"50b9":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i,a=n("1346"),o={name:"appUpdate",props:{tabbar:{type:Boolean,default:!1}},data:function(){return{popup_show:!1,platform:"",version:"1.0.0",need_update:!1,downing:!1,downstatus:0,update_info:{os:"",version:"",info:""},fileSize:0,downSize:0,viewObj:null}},created:function(){i=this},computed:{lengthWidth:function(){var t=this.downSize/this.fileSize*100;return t=t?t.toFixed(2):0,{width:t+"%"}},getHeight:function(){var t=0;return this.tabbar&&(t=50),{bottom:t+"px",height:"auto"}}},methods:{update:function(){},getUpdateInfo:function(){(0,a.getUpdateInfo)("ios"===this.platform?2:1).then((function(e){var n=t.getStorageSync("app_update_time")||"",a=(new Date).toLocaleDateString();if(n!==a)t.setStorageSync("app_update_time",(new Date).toLocaleDateString());else if(!e.data.is_force)return;var o=e.data;i.update_info=o,i.update_info.platform&&i.checkUpdate()})).catch((function(t){i.popup_show=!1}))},checkUpdate:function(){i.need_update=i.compareVersion(i.version,i.update_info.version),i.need_update&&(i.popup_show=!0,i.tabbar&&(i.viewObj=new plus.nativeObj.View("viewObj",{bottom:"0px",left:"0px",height:"50px",width:"100%",backgroundColor:"rgba(0,0,0,.6)"}),i.viewObj.show()))},closeUpdate:function(){i.update_info.is_force?"android"==this.platform?plus.runtime.quit():plus.ios.import("UIApplication").sharedApplication().performSelector("exit"):(i.popup_show=!1,i.viewObj&&i.viewObj.hide())},nowUpdate:function(){if(i.downing)return!1;i.downing=!0,/\.apk$/.test(i.update_info.url)||/\.wgt$/.test(i.update_info.url)?i.download_wgt():plus.runtime.openURL(i.update_info.url,(function(){plus.nativeUI.toast("打开错误")}))},download_wgt:function(){plus.nativeUI.showWaiting("下载更新文件...");var t={method:"get"},e=plus.downloader.createDownload(i.update_info.url,t,(function(t,e){}));e.addEventListener("statechanged",(function(t,e){if(null===e);else if(200==e)switch(i.downstatus=t.state,t.state){case 3:i.downSize=t.downloadedSize,t.totalSize&&(i.fileSize=t.totalSize);break;case 4:i.installWgt(t.filename);break}else plus.nativeUI.closeWaiting(),plus.nativeUI.toast("下载出错"),i.downing=!1,i.downstatus=0})),e.start()},installWgt:function(t){plus.nativeUI.showWaiting("安装更新文件..."),plus.runtime.install(t,{},(function(){plus.nativeUI.closeWaiting(),plus.nativeUI.alert("应用资源下载完成！",(function(){plus.runtime.restart()}))}),(function(t){plus.nativeUI.closeWaiting(),plus.nativeUI.alert("安装更新文件失败["+t.code+"]："+t.message)}))},compareVersion:function(t,e){if(!t||!e||""==t||""==e)return!1;for(var n=t.split(".",4),i=e.split(".",4),a=0;a<n.length&&a<i.length;a++){var o=n[a],u=parseInt(o),r=i[a],s=parseInt(r);if(s>u||r.length>o.length)return!0;if(s<u)return!1}return i.length>n.length&&0==e.indexOf(t)}}};e.default=o}).call(this,n("543d")["default"])},9430:function(t,e,n){"use strict";n.r(e);var i=n("50b9"),a=n.n(i);for(var o in i)"default"!==o&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=a.a},aedc:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return i}));var a=function(){var t=this,e=t.$createElement,n=(t._self._c,!t.popup_show||t.downstatus<1?null:(t.downSize/1024/1024).toFixed(2)),i=!t.popup_show||t.downstatus<1?null:(t.fileSize/1024/1024).toFixed(2);t.$mp.data=Object.assign({},{$root:{g0:n,g1:i}})},o=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/update/app-update"],{4600:function(t,e,n){"use strict";n.r(e);var i=n("8966"),a=n("9430");for(var o in a)"default"!==o&&function(t){n.d(e,t,(function(){return a[t]}))}(o);n("5d1d");var u,r=n("f0c5"),s=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,"582fb10c",null,!1,i["a"],u);e["default"]=s.exports},"50b9":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i,a=n("1346"),o={name:"appUpdate",props:{tabbar:{type:Boolean,default:!1},getVer:{type:Boolean,default:!1}},data:function(){return{popup_show:!1,platform:"",version:"1.0.0",need_update:!1,downing:!1,downstatus:0,update_info:{os:"",version:"",info:""},fileSize:0,downSize:0,viewObj:null}},created:function(){i=this},computed:{lengthWidth:function(){var t=this.downSize/this.fileSize*100;return t=t?t.toFixed(2):0,{width:t+"%"}},getHeight:function(){var t=0;return this.tabbar&&(t=50),{bottom:t+"px",height:"auto"}}},methods:{update:function(){},getUpdateInfo:function(){var e=this;(0,a.getUpdateInfo)("ios"===this.platform?2:1).then((function(n){var a=t.getStorageSync("app_update_time")||"",o=(new Date).toLocaleDateString();if(a!==o)t.setStorageSync("app_update_time",(new Date).toLocaleDateString());else if(a!==o&&e.getVer&&!n.data.is_force)return;var u=n.data;i.update_info=u,i.update_info.platform&&i.checkUpdate()})).catch((function(t){i.popup_show=!1}))},checkUpdate:function(){i.need_update=i.compareVersion(i.version,i.update_info.version),i.need_update?(i.popup_show=!0,i.tabbar&&(i.viewObj=new plus.nativeObj.View("viewObj",{bottom:"0px",left:"0px",height:"50px",width:"100%",backgroundColor:"rgba(0,0,0,.6)"}),i.viewObj.show())):this.$emit("isNew")},closeUpdate:function(){i.update_info.is_force?"android"==this.platform?plus.runtime.quit():plus.ios.import("UIApplication").sharedApplication().performSelector("exit"):(i.popup_show=!1,i.viewObj&&i.viewObj.hide())},nowUpdate:function(){if(i.downing)return!1;i.downing=!0,/\.apk$/.test(i.update_info.url)||/\.wgt$/.test(i.update_info.url)?i.download_wgt():plus.runtime.openURL(i.update_info.url,(function(){plus.nativeUI.toast("打开错误")}))},download_wgt:function(){plus.nativeUI.showWaiting("下载更新文件...");var t={method:"get"},e=plus.downloader.createDownload(i.update_info.url,t,(function(t,e){}));e.addEventListener("statechanged",(function(t,e){if(null===e);else if(200==e)switch(i.downstatus=t.state,t.state){case 3:i.downSize=t.downloadedSize,t.totalSize&&(i.fileSize=t.totalSize);break;case 4:i.installWgt(t.filename);break}else plus.nativeUI.closeWaiting(),plus.nativeUI.toast("下载出错"),i.downing=!1,i.downstatus=0})),e.start()},installWgt:function(t){plus.nativeUI.showWaiting("安装更新文件..."),plus.runtime.install(t,{},(function(){plus.nativeUI.closeWaiting(),plus.nativeUI.alert("应用资源下载完成！",(function(){plus.runtime.restart()}))}),(function(t){plus.nativeUI.closeWaiting(),plus.nativeUI.alert("安装更新文件失败["+t.code+"]："+t.message)}))},compareVersion:function(t,e){if(!t||!e||""==t||""==e)return!1;for(var n=t.split(".",4),i=e.split(".",4),a=0;a<n.length&&a<i.length;a++){var o=n[a],u=parseInt(o),r=i[a],s=parseInt(r);if(s>u||r.length>o.length)return!0;if(s<u)return!1}return i.length>n.length&&0==e.indexOf(t)}}};e.default=o}).call(this,n("543d")["default"])},"5d1d":function(t,e,n){"use strict";var i=n("c027"),a=n.n(i);a.a},8966:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return i}));var a=function(){var t=this,e=t.$createElement,n=(t._self._c,!t.popup_show||t.downstatus<1?null:(t.downSize/1024/1024).toFixed(2)),i=!t.popup_show||t.downstatus<1?null:(t.fileSize/1024/1024).toFixed(2);t.$mp.data=Object.assign({},{$root:{g0:n,g1:i}})},o=[]},9430:function(t,e,n){"use strict";n.r(e);var i=n("50b9"),a=n.n(i);for(var o in i)"default"!==o&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=a.a},c027:function(t,e,n){}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/update/app-update-create-component',
     {

crmeb/public/statics/mp_view/components/update/app-update.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/components/update/app-update.wxml

@@ -1 +1 @@
-<block wx:if="{{popup_show}}"><view class="wrap data-v-57641fdc"><view class="popup-bg data-v-57641fdc" style="{{(getHeight)}}"><view class="{{['popup-content','data-v-57641fdc',(popup_show)?'popup-content-show':'']}}"><view class="update-wrap data-v-57641fdc"><image class="top-img data-v-57641fdc" src="./images/img.png"></image><view class="content data-v-57641fdc"><text class="title data-v-57641fdc">{{"发现新版本"+update_info.version}}</text><view class="title-sub data-v-57641fdc"><rich-text nodes="{{update_info.info}}"></rich-text></view><block wx:if="{{downstatus<1}}"><button data-event-opts="{{[['tap',[['nowUpdate']]]]}}" class="btn data-v-57641fdc" bindtap="__e">立即升级</button></block><block wx:else><view class="sche-wrap data-v-57641fdc"><view class="sche-bg data-v-57641fdc"><view class="sche-bg-jindu data-v-57641fdc" style="{{(lengthWidth)}}"></view></view><text class="down-text data-v-57641fdc">{{"下载进度:"+$root.g0+"M/"+$root.g1+"M"}}</text></view></block></view></view><image class="close-ioc data-v-57641fdc" src="./images/close.png" data-event-opts="{{[['tap',[['closeUpdate']]]]}}" bindtap="__e"></image></view></view></view></block>
+<block wx:if="{{popup_show}}"><view class="wrap data-v-582fb10c"><view class="popup-bg data-v-582fb10c" style="{{(getHeight)}}"><view class="{{['popup-content','data-v-582fb10c',(popup_show)?'popup-content-show':'']}}"><view class="update-wrap data-v-582fb10c"><image class="top-img data-v-582fb10c" src="./images/img.png"></image><view class="content data-v-582fb10c"><text class="title data-v-582fb10c">{{"发现新版本"+update_info.version}}</text><view class="title-sub data-v-582fb10c"><rich-text nodes="{{update_info.info}}"></rich-text></view><block wx:if="{{downstatus<1}}"><button data-event-opts="{{[['tap',[['nowUpdate']]]]}}" class="btn data-v-582fb10c" bindtap="__e">立即升级</button></block><block wx:else><view class="sche-wrap data-v-582fb10c"><view class="sche-bg data-v-582fb10c"><view class="sche-bg-jindu data-v-582fb10c" style="{{(lengthWidth)}}"></view></view><text class="down-text data-v-582fb10c">{{"下载进度:"+$root.g0+"M/"+$root.g1+"M"}}</text></view></block></view></view><image class="close-ioc data-v-582fb10c" src="./images/close.png" data-event-opts="{{[['tap',[['closeUpdate']]]]}}" bindtap="__e"></image></view></view></view></block>

crmeb/public/statics/mp_view/pages/index/diy/components/articleList.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/diy/components/blankPage.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/diy/components/headerSerch.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/diy/components/titles.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/users/login/index.wxss

@@ -1 +1 @@
-page{background:#fff}.appLogin{margin-top:60rpx}.appLogin .hds{display:flex;justify-content:center;align-items:center;font-size:24rpx;color:#b4b4b4}.appLogin .hds .line{width:68rpx;height:1rpx;background:#ccc}.appLogin .hds ._p{margin:0 20rpx}.appLogin .btn-wrapper{display:flex;align-items:center;justify-content:center;margin-top:30rpx}.appLogin .btn-wrapper .btn{display:flex;align-items:center;justify-content:center;width:68rpx;height:68rpx;border-radius:50%}.appLogin .btn-wrapper .apple-btn{display:flex;align-items:center;justify-content:center;width:246rpx;height:66rpx;margin-left:30rpx;background:#eaeaea;border-radius:34rpx;font-size:24rpx}.appLogin .btn-wrapper .apple-btn .icon-s-pingguo{color:#333;margin-right:10rpx;font-size:34rpx}.appLogin .btn-wrapper .iconfont{font-size:40rpx;color:#fff}.appLogin .btn-wrapper .wx{margin-right:30rpx;background-color:#61c64f}.appLogin .btn-wrapper .mima{background-color:#28b3e9}.appLogin .btn-wrapper .yanzheng{background-color:#f89c23}.code ._img{width:100%;height:100%}.acea-row.row-middle input{margin-left:20rpx;display:block}.login-wrapper{padding:30rpx}.login-wrapper .shading{display:flex;align-items:center;justify-content:center;width:100%;margin-top:200rpx}.login-wrapper .shading image{width:240rpx;height:240rpx}.login-wrapper .whiteBg{margin-top:100rpx}.login-wrapper .whiteBg .list{border-radius:16rpx;overflow:hidden}.login-wrapper .whiteBg .list .item{border-bottom:1px solid #f0f0f0;background:#fff}.login-wrapper .whiteBg .list .item .row-middle{position:relative;padding:16rpx 45rpx}.login-wrapper .whiteBg .list .item .row-middle input{flex:1;font-size:28rpx;height:80rpx}.login-wrapper .whiteBg .list .item .row-middle .code{position:absolute;right:30rpx;top:50%;color:var(--view-theme);font-size:26rpx;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.login-wrapper .whiteBg .logon{display:flex;align-items:center;justify-content:center;width:100%;height:86rpx;margin-top:80rpx;background-color:var(--view-theme);border-radius:120rpx;color:#fff;font-size:30rpx}.login-wrapper .whiteBg .tips{margin:30rpx;text-align:center;color:#999}
+page{background:#fff}.appLogin{margin-top:60rpx}.appLogin .hds{display:flex;justify-content:center;align-items:center;font-size:24rpx;color:#b4b4b4}.appLogin .hds .line{width:68rpx;height:1rpx;background:#ccc}.appLogin .hds ._p{margin:0 20rpx}.appLogin .btn-wrapper{display:flex;align-items:center;justify-content:center;margin-top:30rpx}.appLogin .btn-wrapper .btn{display:flex;align-items:center;justify-content:center;width:68rpx;height:68rpx;border-radius:50%}.appLogin .btn-wrapper .apple-btn{display:flex;align-items:center;justify-content:center;width:68rpx;height:68rpx;border-radius:50%;background:#eaeaea}.appLogin .btn-wrapper .apple-btn .icon-s-pingguo{color:#333;font-size:44rpx}.appLogin .btn-wrapper .iconfont{font-size:40rpx;color:#fff}.appLogin .btn-wrapper .wx{margin-right:30rpx;background-color:#61c64f}.appLogin .btn-wrapper .mima{margin-right:30rpx;background-color:#28b3e9}.appLogin .btn-wrapper .yanzheng{background-color:#f89c23}.code ._img{width:100%;height:100%}.acea-row.row-middle input{margin-left:20rpx;display:block}.login-wrapper{padding:30rpx}.login-wrapper .shading{display:flex;align-items:center;justify-content:center;width:100%;margin-top:200rpx}.login-wrapper .shading image{width:240rpx;height:240rpx}.login-wrapper .whiteBg{margin-top:100rpx}.login-wrapper .whiteBg .list{border-radius:16rpx;overflow:hidden}.login-wrapper .whiteBg .list .item{border-bottom:1px solid #f0f0f0;background:#fff}.login-wrapper .whiteBg .list .item .row-middle{position:relative;padding:16rpx 45rpx}.login-wrapper .whiteBg .list .item .row-middle input{flex:1;font-size:28rpx;height:80rpx}.login-wrapper .whiteBg .list .item .row-middle .code{position:absolute;right:30rpx;top:50%;color:var(--view-theme);font-size:26rpx;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.login-wrapper .whiteBg .logon{display:flex;align-items:center;justify-content:center;width:100%;height:86rpx;margin-top:80rpx;background-color:var(--view-theme);border-radius:120rpx;color:#fff;font-size:30rpx}.login-wrapper .whiteBg .tips{margin:30rpx;text-align:center;color:#999}

crmeb/public/statics/mp_view/pages/users/message_center/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/users/message_center/index"],{"199f":function(t,e,i){"use strict";i.r(e);var n=i("8215"),s=i("216f");for(var a in s)"default"!==a&&function(t){i.d(e,t,(function(){return s[t]}))}(a);i("1ff4");var o,c=i("f0c5"),u=Object(c["a"])(s["default"],n["b"],n["c"],!1,null,"910be726",null,!1,n["a"],o);e["default"]=u.exports},"1ff4":function(t,e,i){"use strict";var n=i("6b72"),s=i.n(n);s.a},"216f":function(t,e,i){"use strict";i.r(e);var n=i("3338"),s=i.n(n);for(var a in n)"default"!==a&&function(t){i.d(e,t,(function(){return n[t]}))}(a);e["default"]=s.a},3338:function(t,e,i){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n=i("3474"),s=a(i("c83f"));function a(t){return t&&t.__esModule?t:{default:t}}var o=function(){Promise.all([i.e("common/vendor"),i.e("components/home/index")]).then(function(){return resolve(i("f497"))}.bind(null,i)).catch(i.oe)},c={mixins:[s.default],components:{home:o},data:function(){return{list:[],page:1,type:0,limit:20,loading:!1,finished:!1,tabsList:[{key:0,name:"站内消息"},{key:1,name:"客服消息"}]}},onShow:function(){this.page=1,this.list=[],this.changeTabs(this.type)},onReachBottom:function(){1===this.type?this.getList():this.messageSystem()},onPullDownRefresh:function(){this.page=1,this.finished=!1,this.list=[],1===this.type?this.getList():this.messageSystem()},methods:{changeTabs:function(t){this.type=t,this.page=1,this.limit=20,this.list=[],this.finished=!1,1===t?this.getList():this.messageSystem()},messageSystem:function(){var e=this;this.loading||this.finished||(this.loading=!0,t.showLoading({title:"加载中"}),(0,n.messageSystem)({page:this.page,limit:this.limit}).then((function(i){var n=i.data;t.hideLoading(),e.loading=!1,e.list=e.list.concat(n.list),e.finished=n.list.length<e.limit,e.page+=1,t.stopPullDownRefresh()})).catch((function(e){t.showToast({title:e.msg,icon:"none"})})))},getList:function(){var e=this;this.loading||this.finished||(this.loading=!0,t.showLoading({title:"加载中"}),(0,n.serviceRecord)({page:this.page,limit:this.limit}).then((function(i){t.stopPullDownRefresh();var n=i.data;t.hideLoading(),e.loading=!1,n.forEach((function(t){1===t.message_type&&(t.message=e.replace_em(t.message)),2===t.message_type&&(t.message=e.replace_em(t.message))})),e.list=e.list.concat(n),e.finished=n.length<e.limit,e.page+=1})).catch((function(e){t.showToast({title:e.msg,icon:"none"})})))},replace_em:function(t){return t=t.replace(/\[em-([a-z_]*)\]/g,"<span class='em em-$1'/></span>"),t},goChat:function(e){t.navigateTo({url:"/pages/customer_list/chat?to_uid="+e+"&type=1"})},goDetail:function(e){t.navigateTo({url:"/pages/users/message_center/messageDetail?id="+e})}}};e.default=c}).call(this,i("543d")["default"])},"6b72":function(t,e,i){},8215:function(t,e,i){"use strict";var n;i.d(e,"b",(function(){return s})),i.d(e,"c",(function(){return a})),i.d(e,"a",(function(){return n}));var s=function(){var t=this,e=t.$createElement;t._self._c},a=[]},b579:function(t,e,i){"use strict";(function(t){i("6e38");n(i("66fd"));var e=n(i("199f"));function n(t){return t&&t.__esModule?t:{default:t}}wx.__webpack_require_UNI_MP_PLUGIN__=i,t(e.default)}).call(this,i("543d")["createPage"])}},[["b579","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/users/message_center/index"],{1722:function(t,e,i){},"199f":function(t,e,i){"use strict";i.r(e);var n=i("e565"),s=i("216f");for(var a in s)"default"!==a&&function(t){i.d(e,t,(function(){return s[t]}))}(a);i("e10e");var o,c=i("f0c5"),h=Object(c["a"])(s["default"],n["b"],n["c"],!1,null,"2cd41b56",null,!1,n["a"],o);e["default"]=h.exports},"216f":function(t,e,i){"use strict";i.r(e);var n=i("3338"),s=i.n(n);for(var a in n)"default"!==a&&function(t){i.d(e,t,(function(){return n[t]}))}(a);e["default"]=s.a},3338:function(t,e,i){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n=i("3474"),s=a(i("c83f"));function a(t){return t&&t.__esModule?t:{default:t}}var o=function(){Promise.all([i.e("common/vendor"),i.e("components/home/index")]).then(function(){return resolve(i("f497"))}.bind(null,i)).catch(i.oe)},c={mixins:[s.default],components:{home:o},data:function(){return{list:[],page:1,type:0,limit:20,loading:!1,finished:!1,tabsList:[{key:0,name:"站内消息"},{key:1,name:"客服消息"}],startData:{clientX:0,clientY:0}}},onShow:function(){this.page=1,this.list=[],this.changeTabs(this.type)},onReachBottom:function(){1===this.type?this.getList():this.messageSystem()},onPullDownRefresh:function(){this.page=1,this.finished=!1,this.list=[],1===this.type?this.getList():this.messageSystem()},methods:{start:function(t){this.startData.clientX=t.changedTouches[0].clientX,this.startData.clientY=t.changedTouches[0].clientY},end:function(t){var e=t.changedTouches[0].clientX-this.startData.clientX,i=t.changedTouches[0].clientY-this.startData.clientY;i>50||i<-50||(e>50?1==this.type&&(this.type=0,this.changeTabs(this.type)):e<-50&&0==this.type&&(this.type=1,this.changeTabs(this.type)))},changeTabs:function(t){this.type=t,this.page=1,this.limit=20,this.list=[],this.finished=!1,1===t?this.getList():this.messageSystem()},messageSystem:function(){var e=this;this.loading||this.finished||(this.loading=!0,t.showLoading({title:"加载中"}),(0,n.messageSystem)({page:this.page,limit:this.limit}).then((function(i){var n=i.data;t.hideLoading(),e.loading=!1,e.list=e.list.concat(n.list),e.finished=n.list.length<e.limit,e.page+=1,t.stopPullDownRefresh()})).catch((function(e){t.showToast({title:e.msg,icon:"none"})})))},getList:function(){var e=this;this.loading||this.finished||(this.loading=!0,t.showLoading({title:"加载中"}),(0,n.serviceRecord)({page:this.page,limit:this.limit}).then((function(i){t.stopPullDownRefresh();var n=i.data;t.hideLoading(),e.loading=!1,n.forEach((function(t){1===t.message_type&&(t.message=e.replace_em(t.message)),2===t.message_type&&(t.message=e.replace_em(t.message))})),e.list=e.list.concat(n),e.finished=n.length<e.limit,e.page+=1})).catch((function(e){t.showToast({title:e.msg,icon:"none"})})))},replace_em:function(t){return t=t.replace(/\[em-([a-z_]*)\]/g,"<span class='em em-$1'/></span>"),t},goChat:function(e){t.navigateTo({url:"/pages/customer_list/chat?to_uid="+e+"&type=1"})},goDetail:function(e){t.navigateTo({url:"/pages/users/message_center/messageDetail?id="+e})}}};e.default=c}).call(this,i("543d")["default"])},b579:function(t,e,i){"use strict";(function(t){i("6e38");n(i("66fd"));var e=n(i("199f"));function n(t){return t&&t.__esModule?t:{default:t}}wx.__webpack_require_UNI_MP_PLUGIN__=i,t(e.default)}).call(this,i("543d")["createPage"])},e10e:function(t,e,i){"use strict";var n=i("1722"),s=i.n(n);s.a},e565:function(t,e,i){"use strict";var n;i.d(e,"b",(function(){return s})),i.d(e,"c",(function(){return a})),i.d(e,"a",(function(){return n}));var s=function(){var t=this,e=t.$createElement;t._self._c},a=[]}},[["b579","common/runtime","common/vendor"]]]);

crmeb/public/statics/mp_view/pages/users/message_center/index.wxml

@@ -1 +1 @@
-<view class="main data-v-910be726"><view class="top-tabs data-v-910be726" style="{{(colorStyle)}}"><block wx:for="{{tabsList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeTabs',[index]]]]]}}" class="{{['tabs','data-v-910be726',(type===index)?'btborder':'']}}" bindtap="__e">{{''+item.name+''}}</view></block></view><block wx:if="{{list.length&&type===1}}"><view class="list data-v-910be726"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goChat',['$0'],[[['list','',index,'to_uid']]]]]]]}}" class="item data-v-910be726" bindtap="__e"><view class="image-wrap data-v-910be726"><image class="image data-v-910be726" src="{{item.avatar}}"></image></view><view class="text-wrap data-v-910be726"><view class="name-wrap data-v-910be726"><view class="name data-v-910be726">{{item.nickname}}</view><view class="data-v-910be726">{{item._update_time}}</view></view><view class="info-wrap data-v-910be726"><block wx:if="{{item.message_type===1}}"><view class="info data-v-910be726"><rich-text nodes="{{item.message}}"></rich-text></view></block><block wx:if="{{item.message_type===2}}"><view class="info data-v-910be726"><rich-text nodes="{{item.message}}"></rich-text></view></block><block wx:if="{{item.message_type===3}}"><view class="info data-v-910be726">[图片]</view></block><block wx:if="{{item.message_type===4}}"><view class="info data-v-910be726">[语音]</view></block><block wx:if="{{item.message_type===5}}"><view class="info data-v-910be726">[商品]</view></block><block wx:if="{{item.message_type===6}}"><view class="info data-v-910be726">[订单]</view></block><block wx:if="{{item.mssage_num}}"><view class="num data-v-910be726">{{item.mssage_num}}</view></block></view></view></view></block></view></block><block wx:if="{{list.length&&type===0}}"><view class="list data-v-910be726"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index,'id']]]]]]]}}" class="item data-v-910be726" bindtap="__e"><view class="image-wrap data-v-910be726"><block wx:if="{{item.type===1}}"><image class="image data-v-910be726" src="../../../static/images/admin-msg.png"></image></block><block wx:else><image class="image data-v-910be726" src="../../../static/images/user-msg.png"></image></block><block wx:if="{{!item.look}}"><view class="no-look data-v-910be726"></view></block></view><view class="text-wrap data-v-910be726"><view class="name-wrap data-v-910be726"><view class="name data-v-910be726">{{item.title||'--'}}</view><view class="data-v-910be726">{{item.add_time}}</view></view><view class="info-wrap data-v-910be726"><view class="info data-v-910be726"><rich-text nodes="{{item.content}}"></rich-text></view></view></view></view></block></view></block><block wx:else><block wx:if="{{finished&&!list.length}}"><view class="empty-wrap data-v-910be726"><view class="image-wrap data-v-910be726"><image class="image data-v-910be726" src="../../../static/images/noMessage.png"></image></view><view class="data-v-910be726">亲、暂无消息记录哟！</view></view></block></block></view>
+<view data-event-opts="{{[['touchstart',[['start',['$event']]]],['touchend',[['end',['$event']]]]]}}" class="main data-v-2cd41b56" bindtouchstart="__e" bindtouchend="__e"><view class="top-tabs data-v-2cd41b56" style="{{(colorStyle)}}"><block wx:for="{{tabsList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeTabs',[index]]]]]}}" class="{{['tabs','data-v-2cd41b56',(type===index)?'btborder':'']}}" bindtap="__e">{{''+item.name+''}}</view></block></view><block wx:if="{{list.length&&type===1}}"><view class="list data-v-2cd41b56"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goChat',['$0'],[[['list','',index,'to_uid']]]]]]]}}" class="item data-v-2cd41b56" bindtap="__e"><view class="image-wrap data-v-2cd41b56"><image class="image data-v-2cd41b56" src="{{item.avatar}}"></image></view><view class="text-wrap data-v-2cd41b56"><view class="name-wrap data-v-2cd41b56"><view class="name data-v-2cd41b56">{{item.nickname}}</view><view class="data-v-2cd41b56">{{item._update_time}}</view></view><view class="info-wrap data-v-2cd41b56"><block wx:if="{{item.message_type===1}}"><view class="info data-v-2cd41b56"><rich-text nodes="{{item.message}}"></rich-text></view></block><block wx:if="{{item.message_type===2}}"><view class="info data-v-2cd41b56"><rich-text nodes="{{item.message}}"></rich-text></view></block><block wx:if="{{item.message_type===3}}"><view class="info data-v-2cd41b56">[图片]</view></block><block wx:if="{{item.message_type===4}}"><view class="info data-v-2cd41b56">[语音]</view></block><block wx:if="{{item.message_type===5}}"><view class="info data-v-2cd41b56">[商品]</view></block><block wx:if="{{item.message_type===6}}"><view class="info data-v-2cd41b56">[订单]</view></block><block wx:if="{{item.mssage_num}}"><view class="num data-v-2cd41b56">{{item.mssage_num}}</view></block></view></view></view></block></view></block><block wx:if="{{list.length&&type===0}}"><view class="list data-v-2cd41b56"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index,'id']]]]]]]}}" class="item data-v-2cd41b56" bindtap="__e"><view class="image-wrap data-v-2cd41b56"><block wx:if="{{item.type===1}}"><image class="image data-v-2cd41b56" src="../../../static/images/admin-msg.png"></image></block><block wx:else><image class="image data-v-2cd41b56" src="../../../static/images/user-msg.png"></image></block><block wx:if="{{!item.look}}"><view class="no-look data-v-2cd41b56"></view></block></view><view class="text-wrap data-v-2cd41b56"><view class="name-wrap data-v-2cd41b56"><view class="name data-v-2cd41b56">{{item.title||'--'}}</view><view class="data-v-2cd41b56">{{item.add_time}}</view></view><view class="info-wrap data-v-2cd41b56"><view class="info data-v-2cd41b56"><rich-text nodes="{{item.content}}"></rich-text></view></view></view></view></block></view></block><block wx:else><block wx:if="{{finished&&!list.length}}"><view class="empty-wrap data-v-2cd41b56"><view class="image-wrap data-v-2cd41b56"><image class="image data-v-2cd41b56" src="../../../static/images/noMessage.png"></image></view><view class="data-v-2cd41b56">亲、暂无消息记录哟！</view></view></block></block></view>

crmeb/public/statics/mp_view/pages/users/message_center/index.wxss

@@ -1 +1 @@
-.list.data-v-910be726{overflow:hidden;padding-top:100rpx}.list .item.data-v-910be726{background-color:#fff;display:flex;align-items:center;padding:30rpx 30rpx;margin:10rpx 20rpx;border-radius:12rpx;box-shadow:0 0 1px 0 rgba(235,214,214,.75);-webkit-box-shadow:0 0 1px 0 rgba(235,214,214,.75);-moz-box-shadow:0 0 1px 0 rgba(235,214,214,.75)}.list .item ~ .item.data-v-910be726{border-top:1rpx solid #f5f5f5}.list .item .image.data-v-910be726{border-radius:50%}.list .image-wrap.data-v-910be726{width:88rpx;height:88rpx;border-radius:50%;position:relative}.list .image-wrap .no-look.data-v-910be726{position:absolute;width:18rpx;height:18rpx;border-radius:50%;background-color:#1abb1d;top:0rpx;right:0rpx;z-index:999}.list .image.data-v-910be726{display:block;width:100%;height:100%}.list .text-wrap.data-v-910be726{flex:1;min-width:0;margin-left:20rpx}.list .name-wrap.data-v-910be726{display:flex;align-items:center;font-size:20rpx;color:#ccc}.list .name.data-v-910be726{flex:1;min-width:0;margin-right:20rpx;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:28rpx;color:#333}.list .info-wrap.data-v-910be726{display:flex;align-items:center;margin-top:18rpx}.list .info.data-v-910be726{flex:1;min-width:0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:24rpx;color:#999}.list .num.data-v-910be726{min-width:32rpx;height:32rpx;border-radius:16rpx;margin-left:20rpx;background-color:#e93323;font-size:20rpx;line-height:32rpx;text-align:center;color:#fff}.empty-wrap.data-v-910be726{font-size:26rpx;text-align:center;color:#999}.empty-wrap .image-wrap.data-v-910be726{width:414rpx;height:436rpx;padding-top:100rpx;margin:0rpx auto 0}.empty-wrap .image.data-v-910be726{display:block;width:100%;height:100%}.main.data-v-910be726{position:relative}.top-tabs.data-v-910be726{position:fixed;width:100%;display:flex;align-items:center;background-color:#fff;font-size:28rpx;border-radius:8rpx;padding:20rpx 0;margin-bottom:10rpx;z-index:1000}.tabs.data-v-910be726{display:flex;align-items:center;padding:4rpx 15rpx;margin:0 20rpx}.btborder.data-v-910be726{color:#fff;background-color:var(--view-theme);border-radius:30rpx}
+.list.data-v-2cd41b56{overflow:hidden;padding-top:100rpx}.list .item.data-v-2cd41b56{background-color:#fff;display:flex;align-items:center;padding:30rpx 30rpx;margin:10rpx 20rpx;border-radius:12rpx;box-shadow:0 0 1px 0 rgba(235,214,214,.75);-webkit-box-shadow:0 0 1px 0 rgba(235,214,214,.75);-moz-box-shadow:0 0 1px 0 rgba(235,214,214,.75)}.list .item ~ .item.data-v-2cd41b56{border-top:1rpx solid #f5f5f5}.list .item .image.data-v-2cd41b56{border-radius:50%}.list .image-wrap.data-v-2cd41b56{width:88rpx;height:88rpx;border-radius:50%;position:relative}.list .image-wrap .no-look.data-v-2cd41b56{position:absolute;width:18rpx;height:18rpx;border-radius:50%;background-color:#1abb1d;top:0rpx;right:0rpx;z-index:999}.list .image.data-v-2cd41b56{display:block;width:100%;height:100%}.list .text-wrap.data-v-2cd41b56{flex:1;min-width:0;margin-left:20rpx}.list .name-wrap.data-v-2cd41b56{display:flex;align-items:center;font-size:20rpx;color:#ccc}.list .name.data-v-2cd41b56{flex:1;min-width:0;margin-right:20rpx;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:28rpx;color:#333}.list .info-wrap.data-v-2cd41b56{display:flex;align-items:center;margin-top:18rpx}.list .info.data-v-2cd41b56{flex:1;min-width:0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:24rpx;color:#999}.list .num.data-v-2cd41b56{min-width:32rpx;height:32rpx;border-radius:16rpx;margin-left:20rpx;background-color:#e93323;font-size:20rpx;line-height:32rpx;text-align:center;color:#fff}.empty-wrap.data-v-2cd41b56{font-size:26rpx;text-align:center;color:#999}.empty-wrap .image-wrap.data-v-2cd41b56{width:414rpx;height:436rpx;padding-top:100rpx;margin:0rpx auto 0}.empty-wrap .image.data-v-2cd41b56{display:block;width:100%;height:100%}.main.data-v-2cd41b56{position:relative;min-height:100vh}.top-tabs.data-v-2cd41b56{position:fixed;width:100%;display:flex;align-items:center;background-color:#fff;font-size:28rpx;border-radius:8rpx;padding:20rpx 0;margin-bottom:10rpx;z-index:1000;transition:all .3s}.tabs.data-v-2cd41b56{display:flex;align-items:center;padding:4rpx 15rpx;margin:0 20rpx;-webkit-animation:Gradient-data-v-2cd41b56 .3s;animation:Gradient-data-v-2cd41b56 .3s;border-radius:30rpx;transition:all .4s}.btborder.data-v-2cd41b56{color:#fff;background-color:var(--view-theme);border-radius:30rpx}@-webkit-keyframes Gradient-data-v-2cd41b56{0%{background-color:pink}50%{background-position:100% 50%}100%{background-position:0 50%}}@keyframes Gradient-data-v-2cd41b56{0%{background-position:0 50%}50%{background-position:100% 50%}100%{background-position:0 50%}}

crmeb/public/statics/mp_view/pages/users/payment_on_behalf/index.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/users/payment_on_behalf/index"],{"2c72":function(e,n,t){"use strict";t.r(n);var a=t("da02"),i=t.n(a);for(var o in a)"default"!==o&&function(e){t.d(n,e,(function(){return a[e]}))}(o);n["default"]=i.a},"545d":function(e,n,t){"use strict";(function(e){t("6e38");a(t("66fd"));var n=a(t("ff1a"));function a(e){return e&&e.__esModule?e:{default:e}}wx.__webpack_require_UNI_MP_PLUGIN__=t,e(n.default)}).call(this,t("543d")["createPage"])},8924:function(e,n,t){"use strict";var a=t("c3f3"),i=t.n(a);i.a},bfd4:function(e,n,t){"use strict";var a;t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return a}));var i=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){e.shareModal=!1},e.e1=function(n){e.shareModal=!1})},o=[]},c3f3:function(e,n,t){},da02:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=u(t("c83f")),i=t("3474"),o=t("c6cd"),r=t("26cb");function u(e){return e&&e.__esModule?e:{default:e}}var c=function(){t.e("components/orderGoods/index").then(function(){return resolve(t("e247"))}.bind(null,t)).catch(t.oe)},s=function(){Promise.all([t.e("common/vendor"),t.e("components/payment/index")]).then(function(){return resolve(t("d82c"))}.bind(null,t)).catch(t.oe)},d={mixins:[a.default],components:{orderGoods:c,payment:s},computed:(0,r.mapGetters)(["isLogin"]),data:function(){return{shareModal:!1,cartInfo:[],resData:{},payMode:[{name:"微信支付",icon:"icon-weixinzhifu",value:"weixin",title:"使用微信快捷支付",payStatus:!0}],pay_close:!1,order_id:""}},watch:{isLogin:{handler:function(e,n){1==e&&this.getDetail()},deep:!0}},onReady:function(){},onLoad:function(e){this.order_id=e.order_id},onShow:function(){this.isLogin?this.getDetail():(0,o.toLogin)()},onShareAppMessage:function(){var e=this;return{title:"",imageUrl:"",path:"/pages/users/payment_on_behalf/index?order_id="+e.order_id+"&spread="+this.$store.state.app.uid}},methods:{payOpen:function(){this.pay_close=!0},getDetail:function(){var e=this;(0,i.friendDetail)(this.order_id).then((function(n){e.resData=n.data.info,e.resData.paid&&!e.resData.type&&e.goOrderDetail()}))},shareFriend:function(){},onChangeFun:function(e){var n=e,t=n.action||null,a=void 0!=n.value?n.value:null;t&&this[t]&&this[t](a)},payClose:function(){this.pay_close=!1},pay_fail:function(){this.pay_close=!1},pay_complete:function(){this.pay_close=!1,this.getDetail(),e.navigateTo({url:"/pages/users/payment_on_behalf/pay_status?order_id="+this.order_id})},goOrderDetail:function(){e.navigateTo({url:"/pages/users/order_details/index?order_id="+this.order_id})}}};n.default=d}).call(this,t("543d")["default"])},ff1a:function(e,n,t){"use strict";t.r(n);var a=t("bfd4"),i=t("2c72");for(var o in i)"default"!==o&&function(e){t.d(n,e,(function(){return i[e]}))}(o);t("8924");var r,u=t("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"272a280a",null,!1,a["a"],r);n["default"]=c.exports}},[["545d","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/users/payment_on_behalf/index"],{"216e":function(e,n,t){},"2c72":function(e,n,t){"use strict";t.r(n);var a=t("da02"),i=t.n(a);for(var o in a)"default"!==o&&function(e){t.d(n,e,(function(){return a[e]}))}(o);n["default"]=i.a},"381a":function(e,n,t){"use strict";var a;t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return a}));var i=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){e.shareModal=!1},e.e1=function(n){e.shareModal=!1})},o=[]},"545d":function(e,n,t){"use strict";(function(e){t("6e38");a(t("66fd"));var n=a(t("ff1a"));function a(e){return e&&e.__esModule?e:{default:e}}wx.__webpack_require_UNI_MP_PLUGIN__=t,e(n.default)}).call(this,t("543d")["createPage"])},da02:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=u(t("c83f")),i=t("3474"),o=(t("514d"),t("c6cd")),r=t("26cb");function u(e){return e&&e.__esModule?e:{default:e}}var s=function(){t.e("components/orderGoods/index").then(function(){return resolve(t("e247"))}.bind(null,t)).catch(t.oe)},c=function(){Promise.all([t.e("common/vendor"),t.e("components/payment/index")]).then(function(){return resolve(t("d82c"))}.bind(null,t)).catch(t.oe)},d={mixins:[a.default],components:{orderGoods:s,payment:c},computed:(0,r.mapGetters)(["isLogin"]),data:function(){return{shareModal:!1,cartInfo:[],resData:{},payMode:[{name:"微信支付",icon:"icon-weixinzhifu",value:"weixin",title:"使用微信快捷支付",payStatus:!0}],pay_close:!1,order_id:""}},watch:{isLogin:{handler:function(e,n){1==e&&this.getDetail()},deep:!0}},onReady:function(){},onLoad:function(e){this.order_id=e.order_id},onShow:function(){this.isLogin?this.getDetail():(0,o.toLogin)()},onShareAppMessage:function(){var e=this;return{title:"",imageUrl:"",path:"/pages/users/payment_on_behalf/index?order_id="+e.order_id+"&spread="+this.$store.state.app.uid}},methods:{payOpen:function(){this.pay_close=!0},getDetail:function(){var e=this;(0,i.friendDetail)(this.order_id).then((function(n){e.resData=n.data.info,e.resData.paid&&!e.resData.type&&e.goOrderDetail()}))},shareFriend:function(){},onChangeFun:function(e){var n=e,t=n.action||null,a=void 0!=n.value?n.value:null;t&&this[t]&&this[t](a)},payClose:function(){this.pay_close=!1},pay_fail:function(){this.pay_close=!1},pay_complete:function(){this.pay_close=!1,this.getDetail(),e.navigateTo({url:"/pages/users/payment_on_behalf/pay_status?order_id="+this.order_id})},goOrderDetail:function(){e.navigateTo({url:"/pages/users/order_details/index?order_id="+this.order_id})}}};n.default=d}).call(this,t("543d")["default"])},f91e:function(e,n,t){"use strict";var a=t("216e"),i=t.n(a);i.a},ff1a:function(e,n,t){"use strict";t.r(n);var a=t("381a"),i=t("2c72");for(var o in i)"default"!==o&&function(e){t.d(n,e,(function(){return i[e]}))}(o);t("f91e");var r,u=t("f0c5"),s=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"d5628ca6",null,!1,a["a"],r);n["default"]=s.exports}},[["545d","common/runtime","common/vendor"]]]);

crmeb/public/statics/mp_view/pages/users/payment_on_behalf/index.wxml

@@ -1 +1 @@
-<view class="main data-v-272a280a" style="{{(colorStyle)}}"><block wx:if="{{!resData.type&&!resData.paid}}"><view class="head data-v-272a280a"><view class="user-img data-v-272a280a"><image src="{{resData.avatar}}" mode class="data-v-272a280a"></image></view><block wx:if="{{!resData.paid&&!resData.type}}"><view class="order-status data-v-272a280a">代付订单创建成功，发给好友帮你付款吧~</view></block></view></block><block wx:else><view class="head-other data-v-272a280a"><view class="user-img data-v-272a280a"><image src="{{resData.paid&&!resData.type&&resData.pay_uid===$store.state.app.uid?resData.pay_avatar:resData.avatar}}" mode class="data-v-272a280a"></image></view><view class="order-status data-v-272a280a"><view class="head-other-nickname data-v-272a280a">{{''+(resData.paid&&!resData.type&&resData.pay_uid===$store.state.app.uid?resData.pay_nickname:resData.nickname)+''}}</view><block wx:if="{{!resData.paid&&resData.type}}"><view class="head-other-trip data-v-272a280a">帮我付一下这件商品了，谢谢~</view></block><block wx:if="{{resData.pay_uid!==$store.state.app.uid&&resData.paid&&resData.type}}"><view class="head-other-trip data-v-272a280a">已经有人替我代付，谢谢啦~</view></block><block wx:if="{{resData.pay_uid===$store.state.app.uid&&resData.paid&&resData.type}}"><view class="head-other-trip data-v-272a280a">谢谢你帮我支付，么么哒~</view></block><block wx:if="{{resData.pay_uid!==resData.uid&&resData.paid&&!resData.type}}"><view class="head-other-trip data-v-272a280a">我已为你代付成功，商家正在努力发货中~</view></block></view></view></block><view class="order-msg data-v-272a280a"><block wx:if="{{resData.paid&&!resData.type}}"><view class="pay-success data-v-272a280a">好友代付成功，商家正在努力发货中~</view></block><block wx:else><view class="pay--box data-v-272a280a"><view class="order-top data-v-272a280a">代付金额</view><view class="order-num data-v-272a280a"><text class="icon data-v-272a280a">¥</text>{{''+resData.pay_price+''}}</view></view></block><block wx:if="{{!resData.paid&&!resData.type}}"><button class="order-btn data-v-272a280a" open-type="share" hover-class="none" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">发送给微信好友</button></block><block wx:if="{{!resData.paid&&resData.type}}"><button data-event-opts="{{[['tap',[['payOpen']]]]}}" class="order-btn data-v-272a280a" bindtap="__e">立即付款</button></block><block wx:if="{{resData.paid&&resData.type}}"><button class="order-btn on-pay data-v-272a280a">订单已支付</button></block><block wx:if="{{resData.paid&&!resData.type}}"><button data-event-opts="{{[['tap',[['goOrderDetail']]]]}}" class="order-btn data-v-272a280a" bindtap="__e">查看订单详情</button></block><block wx:if="{{resData.pay_uid===$store.state.app.uid&&resData.type}}"><view class="order-trip data-v-272a280a">如果订单申请退款，已支付金额将原路退还给您</view></block></view><view class="order-list data-v-272a280a"><order-goods vue-id="77460996-1" cartInfo="{{resData.cartInfo}}" is_confirm="{{true}}" pay_price="{{resData.pay_price}}" is_behalf="{{resData.paid&&!resData.type?true:false}}" class="data-v-272a280a" bind:__l="__l"></order-goods></view><block wx:if="{{shareModal}}"><view class="share-box data-v-272a280a"><image src="/static/images/share-info2.png" data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" bindtap="__e" class="data-v-272a280a"></image></view></block><payment vue-id="77460996-2" payMode="{{payMode}}" pay_close="{{pay_close}}" friendPay="{{true}}" order_id="{{order_id}}" totalPrice="{{resData.pay_price}}" data-event-opts="{{[['^onChangeFun',[['onChangeFun']]]]}}" bind:onChangeFun="__e" class="data-v-272a280a" bind:__l="__l"></payment></view>
+<view class="main data-v-d5628ca6" style="{{(colorStyle)}}"><block wx:if="{{!resData.type&&!resData.paid}}"><view class="head data-v-d5628ca6"><view class="user-img data-v-d5628ca6"><image src="{{resData.avatar}}" mode class="data-v-d5628ca6"></image></view><block wx:if="{{!resData.paid&&!resData.type}}"><view class="order-status data-v-d5628ca6">代付订单创建成功，发给好友帮你付款吧~</view></block></view></block><block wx:else><view class="head-other data-v-d5628ca6"><view class="user-img data-v-d5628ca6"><image src="{{resData.paid&&!resData.type&&resData.pay_uid===$store.state.app.uid?resData.pay_avatar:resData.avatar}}" mode class="data-v-d5628ca6"></image></view><view class="order-status data-v-d5628ca6"><view class="head-other-nickname data-v-d5628ca6">{{''+(resData.paid&&!resData.type&&resData.pay_uid===$store.state.app.uid?resData.pay_nickname:resData.nickname)+''}}</view><block wx:if="{{!resData.paid&&resData.type}}"><view class="head-other-trip data-v-d5628ca6">帮我付一下这件商品了，谢谢~</view></block><block wx:if="{{resData.pay_uid!==$store.state.app.uid&&resData.paid&&resData.type}}"><view class="head-other-trip data-v-d5628ca6">已经有人替我代付，谢谢啦~</view></block><block wx:if="{{resData.pay_uid===$store.state.app.uid&&resData.paid&&resData.type}}"><view class="head-other-trip data-v-d5628ca6">谢谢你帮我支付，么么哒~</view></block><block wx:if="{{resData.pay_uid!==resData.uid&&resData.paid&&!resData.type}}"><view class="head-other-trip data-v-d5628ca6">我已为你代付成功，商家正在努力发货中~</view></block></view></view></block><view class="order-msg data-v-d5628ca6"><block wx:if="{{resData.paid&&!resData.type}}"><view class="pay-success data-v-d5628ca6">好友代付成功，商家正在努力发货中~</view></block><block wx:else><view class="pay--box data-v-d5628ca6"><view class="order-top data-v-d5628ca6">代付金额</view><view class="order-num data-v-d5628ca6"><text class="icon data-v-d5628ca6">¥</text>{{''+resData.pay_price+''}}</view></view></block><block wx:if="{{!resData.paid&&!resData.type}}"><button class="order-btn data-v-d5628ca6" open-type="share" hover-class="none" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">发送给微信好友</button></block><block wx:if="{{!resData.paid&&resData.type}}"><button data-event-opts="{{[['tap',[['payOpen']]]]}}" class="order-btn data-v-d5628ca6" bindtap="__e">立即付款</button></block><block wx:if="{{resData.paid&&resData.type}}"><button class="order-btn on-pay data-v-d5628ca6">订单已支付</button></block><block wx:if="{{resData.paid&&!resData.type}}"><button data-event-opts="{{[['tap',[['goOrderDetail']]]]}}" class="order-btn data-v-d5628ca6" bindtap="__e">查看订单详情</button></block><block wx:if="{{resData.pay_uid===$store.state.app.uid&&resData.type}}"><view class="order-trip data-v-d5628ca6">如果订单申请退款，已支付金额将原路退还给您</view></block></view><view class="order-list data-v-d5628ca6"><order-goods vue-id="77460996-1" cartInfo="{{resData.cartInfo}}" is_confirm="{{true}}" pay_price="{{resData.pay_price}}" is_behalf="{{resData.paid&&!resData.type?true:false}}" class="data-v-d5628ca6" bind:__l="__l"></order-goods></view><block wx:if="{{shareModal}}"><view class="share-box data-v-d5628ca6"><image src="/static/images/share-info2.png" data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" bindtap="__e" class="data-v-d5628ca6"></image></view></block><payment vue-id="77460996-2" payMode="{{payMode}}" pay_close="{{pay_close}}" friendPay="{{true}}" order_id="{{order_id}}" totalPrice="{{resData.pay_price}}" data-event-opts="{{[['^onChangeFun',[['onChangeFun']]]]}}" bind:onChangeFun="__e" class="data-v-d5628ca6" bind:__l="__l"></payment></view>

crmeb/public/statics/mp_view/pages/users/payment_on_behalf/index.wxss

@@ -1 +1 @@
-.main.data-v-272a280a{background-color:#f5f5f5}.main .head.data-v-272a280a{background-color:var(--view-theme);display:flex;flex-direction:column;align-items:center;justify-content:center;padding:60rpx 0 62rpx 0}.main .head .user-img image.data-v-272a280a{width:68rpx;height:68rpx;border-radius:50%}.main .head .order-status.data-v-272a280a{margin-top:20rpx;font-size:28rpx;color:#fff}.main .head-other.data-v-272a280a{background-color:var(--view-theme);display:flex;align-items:center;padding:60rpx 0 60rpx 30rpx}.main .head-other .user-img.data-v-272a280a{display:flex;align-items:center}.main .head-other .user-img image.data-v-272a280a{width:100rpx;height:100rpx;border-radius:50%}.main .head-other .order-status.data-v-272a280a{margin-left:20rpx;color:#fff;display:flex;flex-direction:column;justify-content:space-between;height:100rpx;position:relative}.main .head-other .order-status .head-other-nickname.data-v-272a280a{font-size:28rpx}.main .head-other .order-status .head-other-trip.data-v-272a280a{padding:6rpx 13rpx;font-size:26rpx;background-color:hsla(0,0%,100%,.2);border-radius:6rpx}.main .head-other .order-status .head-other-trip.data-v-272a280a::after{content:"";width:0rpx;height:0rpx;border:10rpx solid hsla(0,0%,100%,.2);border-bottom:10rpx solid transparent;border-left:10rpx solid transparent;border-top:10rpx solid transparent;position:absolute;left:-20rpx;bottom:15rpx}.main .order-msg.data-v-272a280a{background-color:#fff;border-radius:14rpx 14rpx 0 0;display:flex;flex-direction:column;align-items:center;padding:40rpx 0;margin:-30rpx 30rpx 0 30rpx}.main .order-msg .pay--box.data-v-272a280a{text-align:center}.main .order-msg .pay-success.data-v-272a280a{font-size:30rpx;color:#333;font-weight:700}.main .order-msg .order-num.data-v-272a280a{font-size:66rpx;color:#333;font-weight:700}.main .order-msg .order-num .icon.data-v-272a280a{font-size:30rpx}.main .order-msg .order-btn.data-v-272a280a{width:90%;background-color:var(--view-theme);border-radius:80rpx;padding:26rpx 0;color:#fff;font-size:30rpx;text-align:center;margin-top:60rpx}.main .order-msg .order-btn.on-pay.data-v-272a280a{background-color:#ccc}.main .order-msg .order-trip.data-v-272a280a{color:#999;font-size:26rpx;margin-top:32rpx}.main .order-list.data-v-272a280a{margin:30rpx;border-radius:14rpx;overflow:hidden}.main .order-list .orderGoods.data-v-272a280a{margin-top:0}.main .share-box.data-v-272a280a{z-index:1000;position:fixed;left:0;top:0;width:100%;height:100%}.main .share-box image.data-v-272a280a{width:100%;height:100%}
+.main.data-v-d5628ca6{background-color:#f5f5f5}.main .head.data-v-d5628ca6{background-color:var(--view-theme);display:flex;flex-direction:column;align-items:center;justify-content:center;padding:60rpx 0 62rpx 0}.main .head .user-img image.data-v-d5628ca6{width:68rpx;height:68rpx;border-radius:50%}.main .head .order-status.data-v-d5628ca6{margin-top:20rpx;font-size:28rpx;color:#fff}.main .head-other.data-v-d5628ca6{background-color:var(--view-theme);display:flex;align-items:center;padding:60rpx 0 60rpx 30rpx}.main .head-other .user-img.data-v-d5628ca6{display:flex;align-items:center}.main .head-other .user-img image.data-v-d5628ca6{width:100rpx;height:100rpx;border-radius:50%}.main .head-other .order-status.data-v-d5628ca6{margin-left:20rpx;color:#fff;display:flex;flex-direction:column;justify-content:space-between;height:100rpx;position:relative}.main .head-other .order-status .head-other-nickname.data-v-d5628ca6{font-size:28rpx}.main .head-other .order-status .head-other-trip.data-v-d5628ca6{padding:6rpx 13rpx;font-size:26rpx;background-color:hsla(0,0%,100%,.2);border-radius:6rpx}.main .head-other .order-status .head-other-trip.data-v-d5628ca6::after{content:"";width:0rpx;height:0rpx;border:10rpx solid hsla(0,0%,100%,.2);border-bottom:10rpx solid transparent;border-left:10rpx solid transparent;border-top:10rpx solid transparent;position:absolute;left:-20rpx;bottom:15rpx}.main .order-msg.data-v-d5628ca6{background-color:#fff;border-radius:14rpx 14rpx 0 0;display:flex;flex-direction:column;align-items:center;padding:40rpx 0;margin:-30rpx 30rpx 0 30rpx}.main .order-msg .pay--box.data-v-d5628ca6{text-align:center}.main .order-msg .pay-success.data-v-d5628ca6{font-size:30rpx;color:#333;font-weight:700}.main .order-msg .order-num.data-v-d5628ca6{font-size:66rpx;color:#333;font-weight:700}.main .order-msg .order-num .icon.data-v-d5628ca6{font-size:30rpx}.main .order-msg .order-btn.data-v-d5628ca6{width:90%;background-color:var(--view-theme);border-radius:80rpx;padding:26rpx 0;color:#fff;font-size:30rpx;text-align:center;margin-top:60rpx}.main .order-msg .order-btn.on-pay.data-v-d5628ca6{background-color:#ccc}.main .order-msg .order-trip.data-v-d5628ca6{color:#999;font-size:26rpx;margin-top:32rpx}.main .order-list.data-v-d5628ca6{margin:30rpx;border-radius:14rpx;overflow:hidden}.main .order-list .orderGoods.data-v-d5628ca6{margin-top:0}.main .share-box.data-v-d5628ca6{z-index:1000;position:fixed;left:0;top:0;width:100%;height:100%}.main .share-box image.data-v-d5628ca6{width:100%;height:100%}

crmeb/public/statics/mp_view/pages/users/user_info/index.wxml

@@ -1 +1 @@
-<view class="data-v-d96d77be"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]]]}}" bindsubmit="__e" class="data-v-d96d77be"><view class="personal-data data-v-d96d77be" style="{{(colorStyle)}}"><view class="list data-v-d96d77be"><view class="item acea-row row-between-wrapper data-v-d96d77be"><view class="data-v-d96d77be">头像</view><view data-event-opts="{{[['tap',[['uploadpic',['$event']]]]]}}" class="avatar-box data-v-d96d77be" catchtap="__e"><image src="{{userInfo.avatar}}" class="data-v-d96d77be"></image></view></view><view class="item acea-row row-between-wrapper data-v-d96d77be"><view class="data-v-d96d77be">昵称</view><view class="input data-v-d96d77be"><input type="text" name="nickname" value="{{userInfo.nickname}}" class="data-v-d96d77be"/></view></view><view class="item acea-row row-between-wrapper data-v-d96d77be"><view class="data-v-d96d77be">手机号码</view><block wx:if="{{!userInfo.phone}}"><navigator class="input data-v-d96d77be" url="/pages/users/user_phone/index" hover-class="none">点击绑定手机号<text class="iconfont icon-xiangyou data-v-d96d77be"></text></navigator></block><block wx:else><view class="input acea-row row-between-wrapper data-v-d96d77be"><input class="id data-v-d96d77be" type="text" disabled="true" name="phone" value="{{userInfo.phone}}"/><text class="iconfont icon-suozi data-v-d96d77be"></text></view></block></view><view class="item acea-row row-between-wrapper data-v-d96d77be"><view class="data-v-d96d77be">ID号</view><view class="input acea-row row-between-wrapper data-v-d96d77be"><input class="id data-v-d96d77be" type="text" disabled="true" value="{{userInfo.uid}}"/><text class="iconfont icon-suozi data-v-d96d77be"></text></view></view><view class="item acea-row row-between-wrapper data-v-d96d77be"><view class="data-v-d96d77be">权限设置</view><view data-event-opts="{{[['tap',[['Setting',['$event']]]]]}}" class="input data-v-d96d77be" bindtap="__e">点击管理<text class="iconfont icon-xiangyou data-v-d96d77be"></text></view></view><block wx:if="{{userInfo.phone}}"><view class="item acea-row row-between-wrapper data-v-d96d77be"><view class="data-v-d96d77be">更换手机号码</view><navigator class="input data-v-d96d77be" url="/pages/users/user_phone/index?type=1" hover-class="none">点击更换手机号码<text class="iconfont icon-xiangyou data-v-d96d77be"></text></navigator></view></block></view><button class="modifyBnt bg-color data-v-d96d77be" formType="submit">保存修改</button></view></form><block wx:if="{{canvasStatus}}"><canvas style="{{'width:'+(canvasWidth+'px')+';'+('height:'+(canvasHeight+'px')+';')+('position:'+('absolute')+';')+('left:'+('-100000px')+';')+('top:'+('-100000px')+';')}}" canvas-id="canvas" class="data-v-d96d77be"></canvas></block></view>
+<view class="data-v-c1f05174"><form data-event-opts="{{[['submit',[['formSubmit',['$event']]]]]}}" bindsubmit="__e" class="data-v-c1f05174"><view class="personal-data data-v-c1f05174" style="{{(colorStyle)}}"><view class="list data-v-c1f05174"><view class="item acea-row row-between-wrapper data-v-c1f05174"><view class="data-v-c1f05174">头像</view><view data-event-opts="{{[['tap',[['uploadpic',['$event']]]]]}}" class="avatar-box data-v-c1f05174" catchtap="__e"><image src="{{userInfo.avatar}}" class="data-v-c1f05174"></image></view></view><view class="item acea-row row-between-wrapper data-v-c1f05174"><view class="data-v-c1f05174">昵称</view><view class="input data-v-c1f05174"><input type="text" name="nickname" value="{{userInfo.nickname}}" class="data-v-c1f05174"/></view></view><view class="item acea-row row-between-wrapper data-v-c1f05174"><view class="data-v-c1f05174">手机号码</view><block wx:if="{{!userInfo.phone}}"><navigator class="input data-v-c1f05174" url="/pages/users/user_phone/index" hover-class="none">点击绑定手机号<text class="iconfont icon-xiangyou data-v-c1f05174"></text></navigator></block><block wx:else><view class="input acea-row row-between-wrapper data-v-c1f05174"><input class="id data-v-c1f05174" type="text" disabled="true" name="phone" value="{{userInfo.phone}}"/><text class="iconfont icon-suozi data-v-c1f05174"></text></view></block></view><view class="item acea-row row-between-wrapper data-v-c1f05174"><view class="data-v-c1f05174">ID号</view><view class="input acea-row row-between-wrapper data-v-c1f05174"><input class="id data-v-c1f05174" type="text" disabled="true" value="{{userInfo.uid}}"/><text class="iconfont icon-suozi data-v-c1f05174"></text></view></view><view class="item acea-row row-between-wrapper data-v-c1f05174"><view class="data-v-c1f05174">权限设置</view><view data-event-opts="{{[['tap',[['Setting',['$event']]]]]}}" class="input data-v-c1f05174" bindtap="__e">点击管理<text class="iconfont icon-xiangyou data-v-c1f05174"></text></view></view><block wx:if="{{userInfo.phone}}"><view class="item acea-row row-between-wrapper data-v-c1f05174"><view class="data-v-c1f05174">更换手机号码</view><navigator class="input data-v-c1f05174" url="/pages/users/user_phone/index?type=1" hover-class="none">点击更换手机号码<text class="iconfont icon-xiangyou data-v-c1f05174"></text></navigator></view></block></view><button class="modifyBnt bg-color data-v-c1f05174" formType="submit">保存修改</button></view></form><block wx:if="{{canvasStatus}}"><canvas style="{{'width:'+(canvasWidth+'px')+';'+('height:'+(canvasHeight+'px')+';')+('position:'+('absolute')+';')+('left:'+('-100000px')+';')+('top:'+('-100000px')+';')}}" canvas-id="canvas" class="data-v-c1f05174"></canvas></block></view>