feat：选择组件问题

commit/requestPhp.js

@@ -11,13 +11,14 @@ const token = ""
 export const phpToken = uni.getStorageSync('phpToken') || token
 // 需要修改token，和根据实际修改请求头
 export function myRequestPhp(options) {
+	const phpTokens = uni.getStorageSync('phpToken') || token
 	let url = options.url;
 	let method = options.method || "get";
 	let data = options.data || {};
 	let contentType = options.contentType || "application/json;charset=UTF-8";
 	let header = {
 		'Content-Type': contentType,
-		"X-Token": phpToken,
+		"X-Token": phpTokens,
 		...options.header
 	}
 	return new Promise((resolve, reject) => {

main.js

@@ -9,6 +9,11 @@ import Vconsole from "vconsole"
 // import VConsole from 'vconsole'
 const vConsole = new Vconsole();
 // console.log('vConsole is running!');
+// main.js，注意要在use方法之后执行
+import uViews from 'uview-ui'
+Vue.use(uViews)
+// 如此配置即可
+uni.$u.config.unit = 'rpx'
 
 Vue.config.productionTip = false
 Vue.prototype.$time = time 

manifest.json

@@ -90,7 +90,7 @@
         // 自行修改下方的 /web
         "/gateway": {
           // "secure": false,
-          "target": "https://api.hxxfb.com",
+          "target": "https://testapi.hxxfb.com",
           "pathRewirte": {
             //路径重写
             "^/gateway": "/gateway"

package.json

@@ -4,10 +4,12 @@
     "@wangeditor/editor-for-vue": "^1.0.2",
     "base-64": "^1.0.0",
     "crypto-js": "^4.1.1",
+    "dayjs": "^1.11.13",
     "easemob-websdk": "^4.6.0",
     "file-saver": "^2.0.5",
     "html2canvas": "^1.4.1",
     "pinia": "^2.1.0",
+    "uview-ui": "^2.0.38",
     "vconsole": "^3.15.1"
   }
 }

pages/cashier/index.vue

@@ -241,10 +241,13 @@ export default {
       zhuangi: "",
       gongxian: 0,
       jingdou: 0,
+      phpToken: "",
+      
     };
   },
   async onLoad() {
     console.log("进了我的页面了");
+
     await readAppInfo();
     let daySart = new Date();
     this.start_time = this.$time.dateFormat("yyyy-MM-dd", daySart);
@@ -255,9 +258,7 @@ export default {
     let userinfo = uni.getStorageSync("userinfo");
     this.mer_id = selectmerchant.merId;
     let jurisdiction = uni.getStorageSync("jurisdiction");
-    if (this.mer_id > 0) {
-      await getPhpToken();
-    }
+
     if (jurisdiction) {
       jurisdiction.forEach((res, index) => {
         if (res == 7) {
@@ -266,6 +267,8 @@ export default {
       });
     }
     // let selectmerchant = uni.getStorageSync("selectmerchant");
+    const res = await getPhpToken();
+    this.phpToken = res || uni.getStorageSync("phpToken");
     let uid = userinfo.uid;
     console.log(authorization, uid);
     if (authorization && uid) {
@@ -278,15 +281,7 @@ export default {
         selectmerchant.merId > 0 &&
         (selectmerchant.status == 1 || selectmerchant.status == 5)
       ) {
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        this.selectMerchant();
-        this.selectMerchantOrder();
-        this.getZuorijinri();
-        this.getZuixinjilu();
-        this.payUserList();
+        this.getInitData(selectmerchant);
         return;
       } else if (
         selectmerchant.merId >= 0 &&
@@ -363,6 +358,18 @@ export default {
       });
     }
   },
+  watch: {
+    phpToken:{
+      handler(newVal, oldVal) {
+         let selectmerchant = uni.getStorageSync("selectmerchant");
+         if(newVal){
+          this.getInitData(selectmerchant);
+         }
+      },
+      immediate:true
+    }
+  },
+
   //监听tab 分类
   onPageScroll(res) {
     const query = uni.createSelectorQuery().in(this);
@@ -386,21 +393,38 @@ export default {
     this.page = 1;
     this.is_panudn = true;
     this.List = [];
-    this.getZuixinjilu()
-    this.payUserList();
     this.selectMerchant();
     this.selectMerchantOrder();
+    this.getZuorijinri();
+    this.getZuixinjilu();
+    // this.payUserList();
   },
 
   onReachBottom() {
     if (this.is_panudn == true) {
       this.page++;
-      this.payUserList();
+      this.getZuixinjilu();
     } else {
       return;
     }
   },
   methods: {
+      getInitData(selectmerchant) {
+    if (
+      selectmerchant.merId > 0 &&
+      (selectmerchant.status == 1 || selectmerchant.status == 5)
+    ) {
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      this.selectMerchant();
+      this.selectMerchantOrder();
+      this.getZuorijinri();
+      this.getZuixinjilu();
+      this.payUserList();
+    }
+  },
     // 店铺信息头
     selectMerchant() {
       selectMerchant({
@@ -410,7 +434,8 @@ export default {
           console.log(res);
           if (res.data.status == 200) {
             this.merchantCashierShow = res.data.data.merchantCashierShow;
-			this.merchantCashierShow.create_time = this.merchantCashierShow.create_time.split(' ')[0]
+            this.merchantCashierShow.create_time =
+              this.merchantCashierShow.create_time.split(" ")[0];
           }
         },
         (fail) => {
@@ -486,7 +511,7 @@ export default {
     },
     // 最新纪录列表
     payUserList() {
-      return
+      return;
       payUserList({
         mer_id: this.mer_id,
         pageNum: this.page,
@@ -560,7 +585,7 @@ export default {
               }
               this.is_panudn = false;
             }
-            console.log(this.records,"recordsrecordsrecords")
+            console.log(this.records, "recordsrecordsrecords");
             uni.hideLoading();
           }
         },

shop/perating/activitecode.vue

@@ -14,7 +14,7 @@
         <view class="statement-header-text-title" @click="topgi"> 返回</view>
       </view>
     </view>
-    <view class="activite-nav">
+    <view class="activite-nav" id="huoquId">
       <view class="activite-card">
         <image
           class="activite-card-logo"
@@ -22,7 +22,7 @@
           mode=""
         ></image>
 
-        <view class="activite-cardImg">
+        <!-- <view class="activite-cardImg">
           <image :src="qrcode_src" mode="widthFix" ref="imagRef"></image>
         </view>
         <view class="activite-cardText">{{ code_id }}</view>
@@ -43,7 +43,7 @@
               mode=""
             ></image>
           </view>
-        </view>
+        </view> -->
       </view>
       <!-- <image class="activite-card-logo" :src="imageUrl" mode=""></image> -->
       <!-- <view class="downLoadButton" @click="clickGeneratePicture">
@@ -63,7 +63,6 @@
         <view class="downLoad-text"> 保存图片 </view>
       </view>
     </view>
-
     <!-- ************************* 海报画板 **********************-->
     <view style="position: absolute; bottom: 10%; left: 0%" v-show="flag">
       <l-painter
@@ -113,9 +112,9 @@ export default {
       poster: null,
       image: "",
       flag: false,
-      canvasWidth: 300, // 单位：rpx
-      canvasHeight: 300,
       imageUrl: "",
+      canvasWidth: 300,
+      canvasHeight: 400,
     };
   },
   onLoad(e) {
@@ -129,7 +128,11 @@ export default {
     this.qrcode_src = e.qrcode_src;
     this.code_id = e.code_id;
   },
+  mounted() {
+
+  },
   methods: {
+
     queryByKey() {
       const _this = this;
       queryByKey({
@@ -151,54 +154,7 @@ export default {
         }
       );
     },
-    async drawImageToCanvas() {
-      // const ctx = uni.createCanvasContext("myCanvas", this);
-      // 清空画布
-      // ctx.clearRect(0, 0, this.canvasWidth, this.canvasHeight);
-      //  const img = new Image();
-      //   img.crossOrigin = 'anonymous'; // 设置跨域属性
-      //   img.src = 'https://example.com/your-image.jpg'; // 替换为实际的图片地址
-      const _this = this;
-      try {
-        const resData = await uni.getImageInfo({
-          src: decodeURIComponent(this.qrcode_src),
-        });
-        const res = resData[1] || {};
-        // 居中绘制图片（带缩放）
-        const imgWidth = res.width;
-        const imgHeight = res.height;
-        const scale = Math.min(
-          this.canvasWidth / imgWidth,
-          this.canvasHeight / imgHeight
-        );
-        const drawWidth = imgWidth * scale;
-        const drawHeight = imgHeight * scale;
-        const offsetX = (this.canvasWidth - drawWidth) / 2;
-        const offsetY = (this.canvasHeight - drawHeight) / 2;
-        console.log(res, "resData");
-        uni.canvasToTempFilePath({
-          x: offsetX,
-          y: offsetY,
-          width: imgWidth,
-          height: imgHeight,
-          destWidth: drawWidth,
-          destHeight: drawHeight,
-          canvasId: "container",
-          success: function (res) {
-            // 在H5平台下，tempFilePath 为 base64
-            // const imageUrl = `data:image/png;base64,${res.tempFilePath}`;
-            const imageUrl = `${res.tempFilePath}`;
-            const contentPath = _this.$refs.imagRef.contentPath;
-            _this.fileDwonload(imageUrl, contentPath);
-          },
-        });
 
-        // ctx.drawImage(res.path, offsetX, offsetY, drawWidth, drawHeight);
-        // ctx.draw();
-      } catch (err) {
-        console.error("图片加载失败:", err);
-      }
-    },
 
     // 绘制图片
     drawPoster() {
@@ -380,26 +336,34 @@ export default {
       });
     },
     clickGeneratePicture2() {
-      //this.drawImageToCanvas();
+      let _this = this;
       let fileName = "pension_分享海报.jpg";
-      if (this.qrcode_src == "") {
-        uni.showToast({
-          title: "无生成二维码",
-          icon: "none",
-          duration: 2000,
-        });
-        return;
-      }
-      let fileUrl = decodeURIComponent(this.qrcode_src);
-      if (window.android) {
-        window.android.downloadFile(fileName, fileUrl);
-      } else {
-        uni.showToast({
-          title: "未检测到Android环境",
-          icon: "none",
-          duration: 2000,
-        });
-      }
+      this.drawCanvas();
+      // const cardElement = document.getElementById('huoquId');
+      // console.log(cardElement,"cardElement")
+      // html2canvas(cardElement).then((canvas) => {
+      //     const imageUrl = canvas.toDataURL('image/png');
+      //     _this.saveImageData(imageUrl);
+      //   });
+      //
+      // if (this.qrcode_src == "") {
+      //   uni.showToast({
+      //     title: "无生成二维码",
+      //     icon: "none",
+      //     duration: 2000,
+      //   });
+      //   return;
+      // }
+      // let fileUrl = decodeURIComponent(this.qrcode_src);
+      // if (window.android) {
+      //   window.android.downloadFile(fileName, fileUrl);
+      // } else {
+      //   uni.showToast({
+      //     title: "未检测到Android环境",
+      //     icon: "none",
+      //     duration: 2000,
+      //   });
+      // }
     },
     // 保存图片
     saveImage() {
@@ -442,54 +406,7 @@ export default {
       }
     },
 
-    fileDwonload(base64Data, path) {
-      uni.showLoading({ title: "保存中...", mask: true });
-      const _this = this;
-      // const blob = this.base64ToBlob(base64Data);
-      // const blobUrl = URL.createObjectURL(blob);
-      const finName = "海报.jpg";
-      uni.downloadFile({
-        url: path, //请求地址
-        success: (res) => {
-          //下载成功
-          console.log(res, "下载成功");
-          if (res.statusCode === 200) {
-            //保存文件
-            let filePath = res.tempFilePath;
-            // #ifdef H5
-            saveAs(filePath, finName);
-            uni.showModal({
-              title: "保存成功",
-              content: "图片已成功保存到相册，快去分享到您的圈子吧",
-              showCancel: false,
-            });
-            // #endif
-            //  #ifdef MP-WEIXIN || APP-PLUS
-            uni.saveFile({
-              tempFilePath: filePath,
-              success: function (filRes) {
-                console.log(filRes, "=====>");
-              },
-              fail: function (err) {
-                console.log("保存失败");
-              },
-            });
-            // #endif
-            uni.hideLoading();
-          }
-        },
-        fail: (e) => {
-          console.log(e, "文件下载失败downloadFile");
-          uni.hideLoading();
-          _this.loadFiles(path, finName);
 
-          // uni.showToast({
-          //   title: "文件下载保存失败",
-          //   icon: "error",
-          // });
-        },
-      });
-    },
     loadFiles(url, fileName) {
       const a = document.createElement("a");
       a.href = url;
@@ -531,20 +448,6 @@ export default {
         },
       });
     },
-    base64ToBlob(base64) {
-      const parts = base64.split(";base64,");
-      const mimeType = parts[0].split(":")[1];
-      const base64Data = parts[1];
-      var binaryData = atob(base64.split(";base64,")[1]);
-      // const binaryData = atob(base64Data);
-      const arrayBuffer = new ArrayBuffer(binaryData.length);
-      const uint8Array = new Uint8Array(arrayBuffer);
-      for (let i = 0; i < binaryData.length; i++) {
-        uint8Array[i] = binaryData.charCodeAt(i);
-      }
-
-      return new Blob([uint8Array], { type: mimeType });
-    },
     // 保存到相册
     saveImageToAlbum() {
       uni.saveImageToPhotosAlbum({
@@ -575,7 +478,7 @@ page {
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  
+
   .statement-header {
     position: fixed;
     top: 0;
@@ -586,7 +489,7 @@ page {
     background: url("https://cdn.bjtdba.com/vod/image/2022-08-23/20220823132549341.png");
     display: flex;
     justify-content: center;
-  
+
     .statement-header-text {
       width: 686rpx;
       font-size: 36rpx;
@@ -595,17 +498,17 @@ page {
       display: flex;
       // margin-top: 107rpx;
       align-items: center;
-  
+
       .statement-header-text-neishi {
         width: 45rpx;
         height: 45rpx;
         margin-right: 17rpx;
-  
+
         .statement-header-text-icon {
           width: 36rpx;
           height: 36rpx;
           margin-top: 2rpx;
-  
+
           image {
             width: 100%;
             height: 100%;
@@ -614,7 +517,6 @@ page {
       }
     }
   }
-  
 
   .activite-nav {
     width: 100%;

utils/readAppInfo.js

@@ -175,7 +175,7 @@ const func = async () => {
       );
       localStorage.setItem("aaa", "33333");
       console.log("读原生的", localStorage.getItem("aaa"));
-
+       getPhpToken()
       if (storeStaff) {
         queryStoreBranch({
           id: storeStaff.department
@@ -260,14 +260,14 @@ export default func;
 export async function getPhpToken(merId) {
   let phpToken = uni.getStorageSync("phpToken");
   let selectmerchant = uni.getStorageSync("selectmerchant");
-  // console.log("phpToken", phpToken);
-  // console.log("selectmerchant", selectmerchant);
+  console.log("phpToken", phpToken);
+  console.log("selectmerchant", selectmerchant);
   if (!phpToken && (selectmerchant && selectmerchant.merId > 0) || merId > 0) {
-	  uni.showLoading({
-		  title:"数据加载中",
-		  mask:true
-	  })
-     const merIdS = merId || selectmerchant.merId || ""
+    uni.showLoading({
+      title: "数据加载中",
+      mask: true
+    })
+    const merIdS = merId || selectmerchant.merId || ""
     try {
       const res = await getPhpGlobalToken({
         merId: merIdS
@@ -275,17 +275,13 @@ export async function getPhpToken(merId) {
       if (res.data.status == 200) {
         const token = res.data.data.token || "";
         uni.setStorageSync("phpToken", token);
-		console.log(this,"uni.navigateBack({})")
-		if(this.$router){
-			this.$router.go(0)
-		}else{
-			window.location.reload()
-		}
-		
+        console.log(this, "uni.navigateBack({})")
+        return token
+        // window.location.reload()
       } else {
         uni.setStorageSync("phpToken", "");
       }
-	  
+
     } catch (error) {}
   }
 }