Revert "feat: 新增商品详情搭配优惠组件和客服弹窗"

This reverts commit 95eed74b96.

pages/user/user.js

@@ -6,22 +6,22 @@ Page({
         urlList: [],
         user: {}
     },
-    onLoad: function(n) {
+    onLoad: function (n) {
         var o = this;
-        e.pageStart(t).then(function(t) {
+        e.pageStart(t).then(function (t) {
             o.getContent();
         });
     },
-    onShow: function() {
+    onShow: function () {
         this.refresh && this.getContent();
     },
-    onPullDownRefresh: function() {},
-    onShareAppMessage: function() {},
-    getContent: function() {
+    onPullDownRefresh: function () { },
+    onShareAppMessage: function () { },
+    getContent: function () {
         var n = this;
         wx.showLoading({
             title: ""
-        }), e.request('/miniprogram/user', {}, !0).then(function(t) {
+        }), e.request('/miniprogram/user', {}, !0).then(function (t) {
             if (wx.hideLoading(), 200 != t.code) return wx.showModal({
                 title: "提示",
                 content: t.message
@@ -30,18 +30,18 @@ Page({
                 showLoding: !1,
                 user: t.data.user,
                 urlList: t.data.menu
-            }, function() {});
-        }).catch(function(t) {
+            }, function () { });
+        }).catch(function (t) {
             wx.hideLoading();
         });
     },
-    islogin: function() {
+    islogin: function () {
         wx.showLoading({
             title: "加载中"
         });
     },
     refresh: 0,
-    toPage: function(t) {
+    toPage: function (t) {
         var e = t.currentTarget.dataset, n = (e.refresh, e.url);
         n ? wx.navigateTo({
             url: "/pages/".concat(n)
@@ -51,29 +51,29 @@ Page({
             duration: 2e3
         }), this.refresh = 1;
     },
-    callUs: function() {
+    callUs: function () {
         if (!t.globalData.servicetel) return !1;
         wx.makePhoneCall({
             phoneNumber: "" + t.globalData.servicetel
         });
     },
-    updateUserAvatar: function() {
+    updateUserAvatar: function () {
         var that = this;
         wx.chooseMedia({
             count: 1,
             mediaType: ['image'],
             sourceType: ['album', 'camera'],
-            success: function(res) {
+            success: function (res) {
                 wx.uploadFile({
-                    url: 'https://t-jm.v0750.com/miniprogram/upload',
+                    url: 'https://t-jm.v0750.com/miniprogram/user/upload',
                     filePath: res.tempFiles[0].tempFilePath,
                     name: 'file',
-                    success: function(uploadRes) {
+                    success: function (uploadRes) {
                         var data = JSON.parse(uploadRes.data);
                         if (data.code == 200) {
                             e.request('/miniprogram/user/update', {
                                 avatar: data.data.url
-                            }, true).then(function(res) {
+                            }, true).then(function (res) {
                                 if (res.code == 200) {
                                     that.getContent();
                                     wx.showToast({
@@ -93,18 +93,18 @@ Page({
             }
         });
     },
-    updateUserNickname: function() {
+    updateUserNickname: function () {
         var that = this;
         wx.showModal({
             title: '修改昵称',
             editable: true,
             placeholderText: '请输入新昵称',
-            success: function(res) {
+            success: function (res) {
                 if (res.confirm && res.content) {
                     // 发送请求到后端，更新用户昵称
                     e.request('/miniprogram/user/update', {
                         nickname: res.content
-                    }, true).then(function(res) {
+                    }, true).then(function (res) {
                         if (res.code == 200) {
                             that.getContent();
                             wx.showToast({

pages/user/user.wxml

@@ -11,14 +11,14 @@
                     <view class="tel">{{user.mobile}}</view>
                 </view>
                 <view class="right">
-                    <image class="xunzhang" mode="widthFix" src="http://jm.v0750.com/image/xunzhang.png" wx:if="{{user.groupid==6}}"></image>
-                    <image class="zhe" mode="widthFix" src="http://jm.v0750.com/image/zhe.png" wx:if="{{user.isdiscount}}"></image>
+                    <image class="xunzhang" mode="widthFix" src="https://jm-static.v0750.com/image/xunzhang.png" wx:if="{{user.groupid==6}}"></image>
+                    <image class="zhe" mode="widthFix" src="https://jm-static.v0750.com/image/zhe.png" wx:if="{{user.isdiscount}}"></image>
                 </view>
             </view>
             <view class="my-capital shadow">
                 <view class="title">
                     <view class="text">我的资产</view>
-                    <view bindtap="toPage" class="btn" data-refresh="1" data-url="voucher/voucher">立即充值 ></view>
+                    <view bindtap="toPage" class="btn" data-refresh="1" data-url="voucher/voucher">立即购买 ></view>
                 </view>
                 <view class="money-box">
                     <view class="item">
@@ -62,17 +62,14 @@
             <text class="iconfont icon-{{item.img}}"></text>
             <view class="name">{{item.name}}</view>
         </view>
-        <view class="item" openType="contact">
-          <button size="mini" type="default" plain="ture" open-type="contact" >
+        <!-- <view bindtap="callUs" class="item" openType="contact">
             <text class="iconfont icon-10"></text>
             <view class="name">联系客服</view>
-          </button>
-
-        </view>
+        </view> -->
     </view>
     <view class="footer-btn">
         <navigator class="btn" hoverClass="hover" url="/pages/index/index">首页</navigator>
         <view class="btn">扫一扫</view>
-        <navigator class="btn" hoverClass="hover" url="/pages/voucher/voucher">充值</navigator>
+        <navigator class="btn" hoverClass="hover" url="/pages/voucher/voucher">购买洗车金额</navigator>
     </view>
 </view>

pages/user/user.wxss

@@ -194,23 +194,8 @@ button::after {
     width: 33.33%;
 }
 
-.url-list .item button {
-  border: 0;
-  padding: 0;
-  margin: 0;
-  width: 100%;
-}
-.url-list .item button .iconfont {
-  line-height: 52rpx;
-}
-
-.url-list .item button .name {
-  margin-top: -2rpx;
-}
-
 .url-list .item .name {
     margin-top: 22rpx;
-    line-height: 1;
 }
 
 .footer-btn {