✨ 修改bug/增加切换环境组件/调整ui

components/local/change-env/change-env.js

@@ -0,0 +1,109 @@
+// components/local/change-env/change-env.js
+// app.js
+import {
+  login
+} from '../../../utils/http';
+Component({
+  /**
+   * 组件的属性列表
+   */
+  options: {
+    addGlobalClass: true
+  },
+  properties: {
+    visible: {
+      type: Boolean,
+      value: false,
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    inputVal: "",
+    env: false,
+    items: [{
+        value: 'ijolijoli',
+        name: '正式环境',
+        checked: true
+      },
+      {
+        value: 'dev',
+        name: '测试环境',
+        checked: false
+      },
+    ]
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 监听输入框
+    onChangeInput(e) {
+      this.setData({
+        inputVal: e.detail.value
+      })
+    },
+
+    // 点击确定事件
+    onConfirm() {
+      let {
+        env,
+        items
+      } = this.data;
+      if (env) {
+        items.forEach((item, index) => {
+          if (item.checked) {
+            wx.setStorageSync('env', item.value)
+            wx.setStorageSync('token', '')
+            wx.setStorageSync('userInfo', {});
+
+            this.setData({
+              visible: false,
+              env: false,
+            }, () => {
+              // login()
+              wx.reLaunch({
+                url: '/pages/home/home',
+              })
+            })
+          }
+        })
+        return;
+      }
+      if (this.data.inputVal == 'ijolijoli') {
+        this.setData({
+          env: true
+        })
+      } else {
+        wx.showToast({
+          title: '密码错误',
+          icon: 'none'
+        })
+      }
+      console.log(this.data.inputVal)
+    },
+
+    // 点击取消事件
+    onCancel() {
+      this.setData({
+        visible: false,
+        env: false
+      })
+    },
+
+    // 监听却换环境
+    onChangeRadio(e) {
+      console.log('radio发生change事件，携带value值为：', e.detail.value)
+      const items = this.data.items
+      for (let i = 0, len = items.length; i < len; ++i) {
+        items[i].checked = items[i].value === e.detail.value
+      }
+      this.setData({
+        items
+      })
+    },
+  }
+})

components/local/change-env/change-env.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "wux-landscape": "../../dist/landscape/index"
+  }
+}

components/local/change-env/change-env.wxml

@@ -0,0 +1,15 @@
+<wux-landscape visible="{{ visible }}"  maskClosable="{{ true }}" closable="{{ false }}" bind:close="onCancelUse">
+  <view class="use-popup flex-column" wx:if="{{ visible }}">
+    <input wx:if="{{!env}}" class="weui-input" auto-focus placeholder="请输入密码" bindinput="onChangeInput" />
+    <radio-group bindchange="onChangeRadio" wx:if="{{env}}">
+      <label class="flex" wx:for="{{items}}" wx:key="index">
+        <radio value="{{item.value}}" checked="{{item.checked}}"/>
+        <view style="margin-left: 30rpx;">{{item.name}}</view>
+      </label>
+    </radio-group>
+    <view class="use-btn flex">
+      <view class="btn cancel flex-center" bindtap="onCancel">取消</view>
+      <view class="btn confirm flex-center" bindtap="onConfirm">确定</view>
+    </view>
+  </view>
+</wux-landscape>

components/local/change-env/change-env.wxss

@@ -0,0 +1,53 @@
+.use-popup {
+  width: 558rpx;
+  /* height: 350rpx; */
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  overflow: hidden;
+  /* justify-content: center; */
+  justify-content: space-evenly;
+}
+
+/* .use-popup .red {
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #E95564;
+} */
+
+.use-popup input {
+  text-align: left;
+  padding: 30rpx;
+}
+
+radio-group {
+  padding: 30rpx 30rpx 0;
+}
+
+radio-group label {
+  margin-bottom: 30rpx;
+}
+
+.use-btn {
+  padding: 30rpx;
+  border-top: 1rpx solid #ccc;
+}
+
+.use-btn .btn {
+  flex: 1;
+  /* width: 208rpx; */
+  height: 92rpx;
+  /* margin: 0 48rpx; */
+  font-size: 36rpx;
+  color: #FF77B0;
+  border-radius: 52rpx;
+  border: 2rpx solid #FF77B0;
+}
+
+
+.use-btn .confirm {
+  /* margin-top: 28rpx; */
+  margin-left: 46rpx;
+  background-color: #FF77B0;
+  color: #fff;
+}

pages/customerList/customerList.wxml

@@ -16,13 +16,10 @@
       <text>{{ item.nickname }}</text>
     </view>
   </view>
+  <view class="no-data" style="display: {{list.length == 0 ? 'block' : 'none'}};">暂无数据~</view>
 </view>
 
 
-<!-- font-size: 24px;
-font-family: PingFangSC-Regular, PingFang SC;
-font-weight: 400;
-color: #FF77B0; -->
 <view class="fixed flex-column flex-justify-center">
   <text style="font-size: 24rpx;color: #FF77B0;" wx:for="{{ list }}" wx:key="index">{{ item.word }}</text>
 </view>

pages/feedback/feedback.js

@@ -1,6 +1,7 @@
 import {
   get,
-  post
+  post,
+  api_url
 } from '../../utils/http';
 Page({
 
@@ -313,7 +314,7 @@ Page({
     return new Promise((resolve,reject) => {
       let { imgs } = this.data;
       wx.uploadFile({
-        url: 'https://store.test-api.ijolijoli.com/api/upload',
+        url: `${api_url}api/upload`,
         header: {
           token: wx.getStorageSync('token') || '',
         },

pages/member/member.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "个人中心",
-  "usingComponents": {}
+  "usingComponents": {
+    "change-env": "../../components/local/change-env/change-env"
+  }
 }

pages/recordList/recordList.wxml

@@ -10,9 +10,9 @@
         <text>营业复查：{{ todayData.is_review == 1 ? '已复查' : '未复查' }}</text>
       </view>
       <view class="top-text flex-column">
-        <text>今日负责人：{{ todayData.charge_name }}</text>
-        <text style="margin:20rpx 0;">检查负责人：{{ todayData.check_name }}</text>
-        <text>复查检查人：{{ todayData.review_name }}</text>
+        <text>今日负责人：{{ todayData.charge_name || '-' }}</text>
+        <text style="margin:20rpx 0;">检查负责人：{{ todayData.check_name || '-' }}</text>
+        <text>复查检查人：{{ todayData.review_name || '-' }}</text>
       </view>
     </view>
   </view>
@@ -34,5 +34,6 @@
         </view>
       </view>
     </navigator>
+    <view class="no-more-data" style="display: {{list.length == 0 ? 'block' : 'none'}};">暂无数据~</view>
   </view>
 </view>

pages/recordSheet/components/inspect/inspect.js

@@ -1,4 +1,4 @@
-import { post } from "../../../../utils/http";
+import { post,api_url } from "../../../../utils/http";
 
 // pages/recordSheet/components/inspect/inspect.js
 Component({
@@ -175,7 +175,8 @@ Component({
       return new Promise((resolve,reject) => {
         let { imgs } = this.data;
         wx.uploadFile({
-          url: 'https://store.test-api.ijolijoli.com/api/upload',
+          url: `${api_url}api/upload`,
+          // url: 'https://store.test-api.ijolijoli.com/api/upload',
           header: {
             token: wx.getStorageSync('token') || '',
           },

pages/recordSheet/components/review/review.js

@@ -1,4 +1,4 @@
-import { post } from "../../../../utils/http";
+import { post,api_url } from "../../../../utils/http";
 
 // pages/recordSheet/components/inspect/inspect.js
 Component({
@@ -156,7 +156,8 @@ Component({
       return new Promise((resolve,reject) => {
         let { imgs } = this.data;
         wx.uploadFile({
-          url: 'https://store.test-api.ijolijoli.com/api/upload',
+          url: `${api_url}api/upload`,
+          // url: 'https://store.test-api.ijolijoli.com/api/upload',
           header: {
             token: wx.getStorageSync('token') || '',
           },

pages/recordSheet/components/verify/verify.js

@@ -1,4 +1,4 @@
-import { post } from "../../../../utils/http";
+import { post,api_url } from "../../../../utils/http";
 
 Component({
   /**
@@ -174,7 +174,8 @@ Component({
       return new Promise((resolve,reject) => {
         let { imgs } = this.data;
         wx.uploadFile({
-          url: 'https://store.test-api.ijolijoli.com/api/upload',
+          url: `${api_url}api/upload`,
+          // url: 'https://store.test-api.ijolijoli.com/api/upload',
           header: {
             token: wx.getStorageSync('token') || '',
           },

pages/recordSheet/recordSheet.wxml

@@ -10,9 +10,9 @@
         <text>营业复查：{{ todayData.is_review == 1 ? '已复查' : '未复查' }}</text>
       </view>
       <view class="top-text flex-column">
-        <text>今日负责人：{{ todayData.charge_name }}</text>
-        <text style="margin:20rpx 0;">检查负责人：{{ todayData.check_name }}</text>
-        <text>复查检查人：{{ todayData.review_name }}</text>
+        <text>今日负责人：{{ todayData.charge_name || '-' }}</text>
+        <text style="margin:20rpx 0;">检查负责人：{{ todayData.check_name || '-' }}</text>
+        <text>复查检查人：{{ todayData.review_name || '-' }}</text>
       </view>
     </view>
   </view>

pages/role/role.js

@@ -69,7 +69,13 @@ Page({
   },
 
   onChangeRole(e) {
+    let { list } = this.data;
+    list.forEach((item,index) => {
+      item.selected = 0
+    })
+    list[e.currentTarget.dataset.index].selected = 1
     this.setData({
+      list,
       current: e.currentTarget.dataset.index
     })
   },
@@ -79,7 +85,14 @@ Page({
    * api/mruser/role
   */
   getMruserRole() {
+    let { current } = this.data;
     get('api/mruser/role',{},(res) => {
+      // res.data.forEach((item,index) => {
+      //   if(item.) {
+          
+      //   }
+      // })
+      console.log(res.data);
       this.setData({
         list: res.data
       })

pages/role/role.wxml

@@ -1,5 +1,5 @@
 <view class="content">
-  <view class="item flex-align-center {{ index== current ? 'active' : '' }}" wx:for="{{ list }}" wx:key="index" bindtap="onChangeRole" data-id="{{ item.id }}" data-index="{{index}}">{{ item.name }}</view>
+  <view class="item flex-align-center {{ item.selected == 1 ? 'active' : '' }}" wx:for="{{ list }}" wx:key="index" bindtap="onChangeRole" data-id="{{ item.id }}" data-index="{{index}}">{{ item.name }}</view>
 </view>
 
 <view class="btn-box">

utils/http.js

@@ -18,7 +18,7 @@ function http(url,method,params, success, fail) {
       api_url = 'https://store.test-api.ijolijoli.com/'
       break;
     default:
-      api_url = 'https://api.ijolijoli.com/'
+      api_url = 'https://store-api.ijolijoli.com/'
       break;
   }
   return wx.request({