第一版

config/modules/order.js

@@ -9,3 +9,14 @@ export function orderGetAll(data) {
 export function orderGetById(data) {
   return request(`/order/getById`, data, "POST");
 }
+
+
+//  获取核销码
+export function orderGetCode(data) {
+  return request(`/order/getCode`, data, "POST");
+}
+
+// 核销订单
+export function orderVerify(data) {
+  return request(`/order/write`, data, "POST");
+}

pages/login/index.vue

@@ -11,17 +11,23 @@
                     <tui-input placeholder="请输入您的账号" v-model="loginAccount.username" :inputBorder="true"
                         :radius="16"></tui-input>
                     <view class="password" v-show="idx == 0">
-                        <tui-input :type="!showIcon ? 'text' : 'password'" placeholder="请输入您的密码"
+                        <view v-show="!showIcon">
+                            <tui-input type="text" placeholder="请输入您的密码"
                             v-model="loginAccount.password" :inputBorder="true" :radius="16">
                             <template #right>
-                                <view v-if="showIcon">
-                                    <tui-icon name="unseen" :size="26" @click="changeIcon(false)"></tui-icon>
-                                </view>
-                                <view v-else>
-                                    <tui-icon name="seen" :size="26" @click="changeIcon(true)"></tui-icon>
-                                </view>
+                                <tui-icon name="seen" :size="26" @click="changeIcon(true)"></tui-icon>
                             </template>
                         </tui-input>
+                        </view>
+                        <view v-show="showIcon">
+                            <tui-input type="password" placeholder="请输入您的密码"
+                            v-model="loginAccount.password" :inputBorder="true" :radius="16">
+                            <template #right>
+                                <tui-icon name="unseen" :size="26" @click="changeIcon(false)"></tui-icon>
+                            </template>
+                        </tui-input>
+                        </view>
+                        
                     </view>
                     <view class="code" v-show="idx == 1">
                         <tui-input placeholder="请输入验证码" v-model="loginAccount.code" :inputBorder="true" :radius="16">

pages/tabbar/order/index.scss

@@ -131,6 +131,7 @@
                 }
               }
               .left-text {
+                flex: 1;
                 display: flex;
                 flex-direction: column;
                 gap: 6rpx;

pages/tabbar/user/index.vue

@@ -9,22 +9,20 @@
     <view class="picture-bg">
       <view class="bg-icon">
         <tui-icon name="notice" :size="24" color="#FFFFFF"></tui-icon>
-        <tui-icon name="setup" :size="24" color="#FFFFFF" @click="navigateTo('/user_module/businessInfo/index')"></tui-icon>
+        <tui-icon
+          name="setup"
+          :size="24"
+          color="#FFFFFF"
+          @click="navigateTo('/user_module/businessInfo/index')"
+        ></tui-icon>
       </view>
       <view class="bg-image">
-        <image
-          class=""
-          :src="shopInfo.shopLogo"
-          mode="center"
-        />
+        <image class="" :src="shopInfo.shopLogo" mode="center" />
       </view>
       <view class="bg-info">
         <view class="info-image">
           <view class="img">
-            <image
-              class=""
-              :src="shopInfo.shopLogo"
-            />
+            <image class="" :src="shopInfo.shopLogo" />
           </view>
           <view class="info-switch">
             <image class="" src="@/static/image/user/switch.png" />
@@ -47,15 +45,11 @@
         </view>
         <view class="flowing-box left">
           <view class="flowing-txt">途中金额</view>
-          <view class="flowing-price"
-            >¥{{ frozenMoney }}元</view
-          >
+          <view class="flowing-price">¥{{ frozenMoney }}元</view>
         </view>
         <view class="flowing-box">
           <view class="flowing-txt">已到账金额</view>
-          <view class="flowing-price"
-            >¥{{ withdrawableMoney }}元</view
-          >
+          <view class="flowing-price">¥{{ withdrawableMoney }}元</view>
         </view>
       </view>
       <view class="user-account">
@@ -80,24 +74,25 @@
 </template>
 
 <script>
-import { getFinanceCount,getShopDetail } from "@/config/index.js";
+import { getFinanceCount, getShopDetail } from "@/config/index.js";
 export default {
   created() {
     this.getFinance();
-
+  },
+  onShow() {
     //  本地获取店铺信息
-    this.shopInfo = uni.getStorageSync('shopInfo')
+    this.shopInfo = uni.getStorageSync("shopInfo");
     //  如果没有店铺信息 请求店铺信息
-    if(!this.shopInfo){
-      this.getShop()
+    if (!this.shopInfo) {
+      this.getShop();
     }
   },
   data() {
     return {
-      shopInfo:null,
+      shopInfo: null,
       turnover: 0,
       frozenMoney: 0,
-      withdrawableMoney:0,
+      withdrawableMoney: 0,
       accountList: [
         {
           title: "商家入驻",
@@ -106,7 +101,7 @@ export default {
         {
           title: "商家码",
           image: require("@/static/image/user/account_02.png"),
-          url:'/user_module/merchantCode/index'
+          url: "/user_module/merchantCode/index",
         },
         {
           title: "员工账户",
@@ -125,19 +120,19 @@ export default {
     async getFinance() {
       let res = await getFinanceCount({ condition: "1", time: "" });
       this.financeInfo = res.data;
-      this.animateNumber('turnover',res.data.turnover)
-      this.animateNumber('frozenMoney',res.data.frozenMoney)
-      this.animateNumber('withdrawableMoney',res.data.withdrawableMoney)
+      this.animateNumber("turnover", res.data.turnover);
+      this.animateNumber("frozenMoney", res.data.frozenMoney);
+      this.animateNumber("withdrawableMoney", res.data.withdrawableMoney);
     },
     //  获取店铺详情
-		async getShop() {
-			let { data } = await getShopDetail({});
-			this.shopInfo = data
-			//  将店铺存到本地
-			uni.setStorageSync('shopInfo', data)
-		},
+    async getShop() {
+      let { data } = await getShopDetail({});
+      this.shopInfo = data;
+      //  将店铺存到本地
+      uni.setStorageSync("shopInfo", data);
+    },
     //  流水动画
-    animateNumber(str,targetNum) {
+    animateNumber(str, targetNum) {
       const duration = 2000; // 动画时长，单位毫秒
       const interval = 20; // 动画间隔时间，单位毫秒
       const distance = targetNum - this[str];
@@ -146,7 +141,7 @@ export default {
 
       let currentStep = 0;
       const timer = setInterval(() => {
-        if(!targetNum) return
+        if (!targetNum) return;
         currentStep++;
         this[str] = parseFloat((this[str] + step).toFixed(2));
         if (currentStep >= steps) {
@@ -156,13 +151,13 @@ export default {
       }, interval);
     },
     // 下方功能页面跳转
-    userAccount(item){
-      if(!item.url){
-        this.$showToast('功能暂未开放');
-        return
+    userAccount(item) {
+      if (!item.url) {
+        this.$showToast("功能暂未开放");
+        return;
       }
-      this.navigateTo(item.url)
-    }
+      this.navigateTo(item.url);
+    },
   },
 };
 </script>

pages_module/orderVerifica/index.vue

@@ -1,246 +1,407 @@
 <template>
-    <view class="orderVerifica">
-        <capsule :showBorder="true">
-            <template v-slot:top>
-                <view class="shop-top">
-                    <view class="back-icon" @click="backClick">
-                        <tui-icon name="arrowleft" :size="36" color="#000"></tui-icon>
-                    </view>
-                    <view class="shop-name">订单核销</view>
-                </view>
-            </template>
-        </capsule>
-        <view class="order-number">订单编号:139529738377368</view>
-        <view class="verifica-container">
-            <view class="verifica-info">
-                <view class="info-state">订单状态：(待核销已付款)</view>
-                <view class="info-state">商户:麦乐鸡烤肉店 </view>
-                <view class="info-price">
-                    <view class="all-price">
-                        商品总价:￥<text>199.99</text>
-                    </view>
-                    <view class="all-price">
-                        实付款:￥<text>198.99</text>
-                    </view>
-                </view>
+  <view class="orderVerifica">
+    <capsule :showBorder="true">
+      <template v-slot:top>
+        <view class="shop-top">
+          <view class="back-icon" @click="backClick">
+            <tui-icon name="arrowleft" :size="36" color="#000"></tui-icon>
+          </view>
+          <view class="shop-name">订单核销</view>
+        </view>
+      </template>
+    </capsule>
+    <template v-if="!flag">
+      <view class="order-number"
+        >订单编号:{{ orderDetail.orderFormid || "" }}</view
+      >
+      <view class="verifica-container">
+        <view class="verifica-info">
+          <view class="info-state">
+            <template v-if="orderDetail.state == 8"
+              >订单状态：(待核销)</template
+            >
+            <template v-if="orderDetail.state == 9"
+              >订单状态：(待核销已付款)</template
+            >
+            <template v-if="orderDetail.state == 10"
+              >订单状态：<text style="color: #ea1717;">(已核销)</text></template
+            >
+          </view>
+          <view class="info-state">商户: {{ shopInfo.shopName }} </view>
+          <view class="info-price">
+            <view class="all-price">
+              商品总价:￥<text>{{
+                orderDetail.price ? Number(orderDetail.price).toFixed(2) : ""
+              }}</text>
             </view>
-            <view class="verifica-product">
-                <view class="verifica-time">
-                    <text>创建时间</text>
-                    <text>2024-06-01 11:29:42</text>
+            <view class="all-price">
+              实付款:￥<text>{{
+                orderDetail.orderPrice
+                  ? Number(orderDetail.orderPrice).toFixed(2)
+                  : ""
+              }}</text>
+            </view>
+          </view>
+        </view>
+        <view class="verifica-product">
+          <view class="verifica-time">
+            <text>创建时间</text>
+            <text>{{ orderDetail.createTime }}</text>
+          </view>
+          <view class="commodity-list">
+            <view
+              class="commodity-item"
+              v-for="item in orderDetail.products"
+              :key="item.productId"
+            >
+              <view class="item-left">
+                <view class="left-image">
+                  <image :src="item.image" />
                 </view>
-                <view class="commodity-list">
-                    <view class="commodity-item">
-                        <view class="item-left">
-                            <view class="left-image">
-                                <image
-                                    src="https://img2.baidu.com/it/u=1700149007,2105278410&fm=253&fmt=auto&app=138&f=JPEG?w=400&h=400" />
-                            </view>
-                            <view class="left-text">
-                                <view class="text-title">嘿嘿嘿</view>
-                                <!-- <template v-if="item2.productName == '扫码付款商品'">
+                <view class="left-text">
+                  <view class="text-title">{{ item.productName }}</view>
+                  <!-- <template v-if="item2.productName == '扫码付款商品'">
                                     <view class="text-price">扫码付款商品</view>
                                 </template> -->
-                                <template>
-                                    <view class="text-price">小份</view>
-                                    <view class="text-price">x1</view>
-                                </template>
-                            </view>
-                        </view>
-                        <view class="item-right">￥99.00</view>
-                    </view>
-                </view>
-                <view class="gifts">
-                    <view class="gifs-left">赠送代金券</view>
-                    <view class="gifs-right">￥1 x 1</view>
-                </view>
-                <view class="verifica-code">
-                    <text>核销码</text>
-                    <text>4561-JFHXDKHGM8</text>
+                  <template>
+                    <view class="text-price">{{
+                      item.skuDetails[0].skuName
+                    }}</view>
+                    <view class="text-price">x{{ item.number }}</view>
+                  </template>
                 </view>
+              </view>
+              <view class="item-right"
+                >￥{{ item.productPrice.toFixed(2) }}</view
+              >
             </view>
-            <view class="verifica-btn">
-                <view class="btn">确认核销</view>
-            </view>
+          </view>
+          <!-- <view class="gifts">
+          <view class="gifs-left">赠送代金券</view>
+          <view class="gifs-right">￥1 x 1</view>
+        </view> -->
+          <view class="verifica-code">
+            <text>核销码</text>
+            <text>{{ code }}</text>
+          </view>
+          <view class="verifica-code">
+            <text>支付方式</text>
+            <text>
+              <template v-if="orderDetail.paymentMode == 1"
+                >微信</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 2"
+                >支付宝</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 3"
+                >花呗分期</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 4"
+                >通联支付</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 5"
+                >平台余额支付</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 6"
+                >商家余额支付</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 7"
+                >佣金支付</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 8"
+                >消费金支付</template
+              >
+              <template v-else-if="orderDetail.paymentMode == 9"
+                >惠市宝支付</template
+              >
+              <template v-else
+                >用户暂未支付该订单</template
+              >
+            </text>
+          </view>
+          <view class="verifica-code">
+            <text>支付时间</text>
+            <text>{{ orderDetail.paymentTime || "用户暂未支付该订单" }}</text>
+          </view>
+        </view>
+        <view class="verifica-btn">
+          <template v-if="orderDetail.state == 9">
+            <view class="btn" @click="confirmBtn">确认核销</view>
+          </template>
+          <template v-else-if="orderDetail.state == 8">
+            <view class="btn disable" @click="disableBtn">确认核销</view>
+          </template>
         </view>
-    </view>
+      </view>
+      <modal
+        :showModal="modal"
+        :promptList="promptList"
+        @closeModal="closeModal"
+        @btnClick="backClick"
+        :showBtn="showBtn"
+        :showText="showText"
+      ></modal>
+    </template>
+    <template v-else>
+      <view class="success-container">
+        <image class="" src="@/static/image/code/success.png" />
+        <text>核销成功</text>
+        <view class="success-back" @click="back">返回</view>
+      </view>
+    </template>
+  </view>
 </template>
 
 <script>
-import { orderGetById } from '@/config/index.js'
+import { orderGetById, orderVerify } from "@/config/index.js";
+
 export default {
-    onLoad(props){
-        console.log(props);
-        this.orderId = props.orderId
-        this.getOrderDetail()
-    },
-    data() {
-        return {
-            //  订单详情
-            orderDetail:{},
-            orderId:null
+  created() {
+    //  拿到本地的 店铺数据
+    this.shopInfo = uni.getStorageSync("shopInfo");
+  },
+  onLoad(props) {
+    this.orderId = props.orderId;
+    this.code = props.code.split("~")[1];
+    this.getOrderDetail();
+  },
+  data() {
+    return {
+      shopInfo: {},
+      //  订单详情
+      orderDetail: {},
+      orderId: null,
+      code: "",
+      //    下面是弹框
+      modal: false,
+      showBtn: false,
+      promptList: [],
+      showText: "返回扫码",
+      //    判断是否核销成功
+      flag: false,
+    };
+  },
+  methods: {
+    // 获取订单详情
+    async getOrderDetail() {
+      try {
+        let res = await orderGetById({ orderId: this.orderId });
+        if (Object.keys(res.data).length <= 0) {
+          this.modal = true;
+          this.showBtn = true;
+          this.showText = "返回扫码";
+          this.promptList = [
+            "您扫描的当前订单",
+            "可能不是您家下的单，请于用户确认",
+          ];
         }
+        this.orderDetail = res.data;
+      } catch (error) {}
     },
-    methods: {
-        // 获取订单详情
-        async getOrderDetail(){
-            try {
-                let res = await orderGetById({orderId:this.orderId})
-                console.log(res);
-            } catch (error) {
-                
-            }
-        },
-        backClick() {
-            uni.navigateBack()
-        }
+    confirmBtn() {
+      this.showText = "确认";
+      this.modal = true;
+      this.showBtn = true;
+      this.promptList = ["确认订单信息", "用户商品是否是您家下的"];
     },
-}
+    disableBtn() {
+      this.modal = true;
+      this.showBtn = false;
+      this.promptList = ["您不能进行核销", "当前订单处于未支付状态"];
+    },
+    //  关闭弹框
+    closeModal() {
+      this.modal = false;
+    },
+    async backClick() {
+      if (this.showText == "返回扫码") {
+        uni.navigateBack();
+        return;
+      }
+      if (this.showText == "确认") {
+        let res = await orderVerify({ orderId: this.orderId, noticeId: 0 });
+        this.flag = true
+      }
+    },
+    back(){
+        uni.navigateBack();
+    }
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .orderVerifica {
-    .shop-top {
-        width: 100%;
-        height: 100%;
-        position: relative;
-        z-index: 999;
-        @include flex(center);
-
-        .back-icon {
-            position: absolute;
-            left: 0;
-            top: 50%;
-            transform: translateY(-50%);
-        }
+  .shop-top {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    z-index: 999;
+    @include flex(center);
 
-        .shop-name {
-            color: #000;
-        }
+    .back-icon {
+      position: absolute;
+      left: 0;
+      top: 50%;
+      transform: translateY(-50%);
     }
 
-    .order-number {
-        margin: 32rpx 0;
-        color: #999999;
-        font-size: 28rpx;
-        padding-left: 32rpx;
+    .shop-name {
+      color: #000;
     }
+  }
 
-    .verifica-container {
-        padding: 0 60rpx;
+  .order-number {
+    margin: 32rpx 0;
+    color: #999999;
+    font-size: 28rpx;
+    padding-left: 32rpx;
+  }
 
-        .verifica-info {
-            display: flex;
-            flex-direction: column;
-            gap: 12rpx;
-            color: #3D3D3D;
-            font-size: 28rpx;
-            font-weight: 600;
-            padding-bottom: 20rpx;
-            border-bottom: 2rpx solid #D8D8D8;
+  .verifica-container {
+    padding: 0 60rpx;
 
-            text {
-                color: #EA1717;
-            }
+    .verifica-info {
+      display: flex;
+      flex-direction: column;
+      gap: 12rpx;
+      color: #3d3d3d;
+      font-size: 28rpx;
+      font-weight: 600;
+      padding-bottom: 20rpx;
+      border-bottom: 2rpx solid #d8d8d8;
 
-            .info-price {
-                @include flex(space-between);
-            }
-        }
+      text {
+        color: #ea1717;
+      }
 
-        .verifica-product {
-            padding: 12rpx 0 20rpx;
-            border-bottom: 2rpx solid #D8D8D8;
+      .info-price {
+        @include flex(space-between);
+      }
+    }
 
-            .verifica-time {
-                @include flex(space-between);
-                color: #999999;
-                font-size: 24rpx;
-            }
+    .verifica-product {
+      padding: 12rpx 0 20rpx;
+      border-bottom: 2rpx solid #d8d8d8;
 
-            .commodity-list {
+      .verifica-time {
+        @include flex(space-between);
+        color: #999999;
+        font-size: 24rpx;
+      }
+
+      .commodity-list {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        gap: 12rpx;
+        flex-direction: column;
+        margin: 20rpx 0 36rpx;
+
+        .commodity-item {
+          display: flex;
+          justify-content: space-between;
+
+          .item-left {
+            display: flex;
+            gap: 12rpx;
+
+            .left-image {
+              width: 124rpx;
+              height: 124rpx;
+
+              image {
                 width: 100%;
-                display: flex;
-                justify-content: center;
-                gap: 12rpx;
-                flex-direction: column;
-                margin: 20rpx 0 36rpx;
-
-                .commodity-item {
-                    display: flex;
-                    justify-content: space-between;
-
-                    .item-left {
-                        display: flex;
-                        gap: 12rpx;
-
-                        .left-image {
-                            width: 124rpx;
-                            height: 124rpx;
-
-                            image {
-                                width: 100%;
-                                height: 100%;
-                                border-radius: 12rpx;
-                            }
-                        }
-
-                        .left-text {
-                            display: flex;
-                            flex-direction: column;
-                            gap: 6rpx;
-
-                            .text-title {
-                                color: #333333;
-                                font-size: 28rpx;
-                            }
-
-                            .text-price {
-                                font-size: 24rpx;
-                                color: #999999;
-                            }
-                        }
-                    }
-
-                    .item-right {
-                        color: #333333;
-                        font-size: 28rpx;
-                    }
-                }
+                height: 100%;
+                border-radius: 12rpx;
+              }
             }
 
-            .gifts {
-                @include flex(space-between);
-                font-size: 28rpx;
+            .left-text {
+              display: flex;
+              flex-direction: column;
+              gap: 6rpx;
+
+              .text-title {
                 color: #333333;
+                font-size: 28rpx;
+              }
 
-                .gifs-right {
-                    color: #ea1717;
-                }
+              .text-price {
+                font-size: 24rpx;
+                color: #999999;
+              }
             }
+          }
 
-            .verifica-code {
-                color: #3D3D3D;
-                font-size: 28rpx;
-                @include flex(space-between);
-                margin-top: 32rpx;
-            }
+          .item-right {
+            color: #333333;
+            font-size: 28rpx;
+          }
         }
-        .verifica-btn{
-            padding-top: 72rpx;
-            display: flex;
-            justify-content: flex-end;
-            .btn{
-                width: 246rpx;
-                height: 88rpx;
-                text-align: center;
-                line-height: 88rpx;
-                color: #FFFFFF;
-                font-size: 28rpx;
-                border-radius: 50rpx;
-                background: linear-gradient(180deg, #FE4B1E 0%, #FB8857 100%);
-            }
+      }
+
+      .gifts {
+        @include flex(space-between);
+        font-size: 28rpx;
+
+        .gifs-right {
+          color: #ea1717;
         }
+      }
+
+      .verifica-code {
+        color: #3d3d3d;
+        font-size: 28rpx;
+        @include flex(space-between);
+        margin-top: 32rpx;
+      }
+    }
+    .verifica-btn {
+      padding-top: 72rpx;
+      display: flex;
+      justify-content: flex-end;
+      .btn {
+        width: 246rpx;
+        height: 88rpx;
+        text-align: center;
+        line-height: 88rpx;
+        color: #ffffff;
+        font-size: 28rpx;
+        border-radius: 50rpx;
+        background: linear-gradient(180deg, #fe4b1e 0%, #fb8857 100%);
+      }
+      .disable {
+        background: linear-gradient(180deg, #3b3b3b 0%, #a3a3a3 100%);
+      }
+    }
+  }
+
+  .success-container{
+    margin-top: 208rpx;
+    width: 100%;
+    @include flex(center,column);
+    image{
+        width: 300rpx;
+        height: 300rpx;
+        display: block;
+    }
+    text{
+        margin-top: 25rpx;
+        color: #666666;
+        font-size: 28rpx;
+    }
+    .success-back{
+        margin-top: 52rpx;
+        border-radius: 100rpx;
+        background-color: #05C160;
+        width: 246rpx;
+        height: 88rpx;
+        text-align: center;
+        line-height: 88rpx;
+        color: #FFFFFF;
+        font-size: 28rpx;
     }
+  }
 }
-</style>
+</style>

pages_module/scanCode/index.vue

@@ -1,315 +1,367 @@
 <template>
-    <view class="scanCode">
-        <capsule :showBorder="true">
-            <template v-slot:top>
-                <view class="shop-top">
-                    <view class="back-icon" @click="backClick">
-                        <tui-icon name="arrowleft" :size="42" color="#FFFFFF"></tui-icon>
-                    </view>
-                    <view class="shop-name">{{ shopInfo.shopName }}</view>
-                </view>
-            </template>
-        </capsule>
-        <view class="scanning">
-            <view class="scan-box">
-                <view class="border-box"></view>
-                <view class="border-box2"></view>
-                <view class="border-box3"></view>
-                <view class="border-box4"></view>
-                <camera class="scan-camera" @scancode="onScancode" mode="scanCode" device-position="back" flash="auto">
-                    <cover-view class="scan-animation" :animation="animation"></cover-view>
-                </camera>
-            </view>
-            <view class="scab-txt">将二维码/条码放到取景框中，即可自动扫描</view>
+  <view class="scanCode">
+    <capsule :showBorder="true">
+      <template v-slot:top>
+        <view class="shop-top">
+          <view class="back-icon" @click="backClick">
+            <tui-icon name="arrowleft" :size="42" color="#FFFFFF"></tui-icon>
+          </view>
+          <view class="shop-name">{{ shopInfo.shopName }}</view>
         </view>
-        <view class="btn-list">
-            <view class="btn" @click="goCoupons">
-                <image src="@/static/image/code/keyboard.png" />
-                <text>输码验劵</text>
-            </view>
-            <view class="btn" @click="openAlbum">
-                <image src="@/static/image/code/photo.png" />
-                <text>打开相册</text>
-            </view>
-        </view>
-        <modal :showModal="modal" :promptList="promptList" @closeModal="closeModal" :showBtn="false"></modal>
+      </template>
+    </capsule>
+    <view class="scanning">
+      <view class="scan-box">
+        <view class="border-box"></view>
+        <view class="border-box2"></view>
+        <view class="border-box3"></view>
+        <view class="border-box4"></view>
+        <camera
+          class="scan-camera"
+          @scancode="onScancode"
+          @error="errorChange"
+          @initdone="cameraReady"
+          mode="scanCode"
+          device-position="back"
+          flash="auto"
+        >
+          <cover-view
+            class="scan-animation"
+            :animation="animation"
+          ></cover-view>
+        </camera>
+      </view>
+      <view class="scab-txt">将二维码/条码放到取景框中，即可自动扫描</view>
+    </view>
+    <view class="btn-list">
+      <view class="btn" @click="goCoupons">
+        <image src="@/static/image/code/keyboard.png" />
+        <text>输码验劵</text>
+      </view>
+      <view class="btn" @click="openAlbum">
+        <image src="@/static/image/code/photo.png" />
+        <text>打开相册</text>
+      </view>
     </view>
+    <modal
+      :showModal="modal"
+      :promptList="promptList"
+      @closeModal="closeModal"
+      @btnClick="btnClick"
+      :showBtn="showBtn"
+      showText="确定"
+    ></modal>
+  </view>
 </template>
 
 <script>
 var animation = uni.createAnimation({
-    timingFunction: "linear",
-    delay: 0
+  timingFunction: "linear",
+  delay: 0,
 });
 export default {
-    created() {
-        //  获取本地存储的店铺数据
-        this.shopInfo = uni.getStorageSync('shopInfo');
-        setTimeout(() => {
-            this.getOrderIdFromUrl('https://test.tuanfengkeji.cn/TFShop_Uni_H5/#/pages/jump/jump?orderId=4979&type=verification&code=4979~JFHXQSZD4F')
-        }, 8000)
+  created() {
+    //  获取本地存储的店铺数据
+    this.shopInfo = uni.getStorageSync("shopInfo");
+    // setTimeout(() => {
+    //     // this.getOrderIdFromUrl('https://www.tuanfengkeji.cn/TFShop_Uni_H5/#/pages/jump/jump?orderId=5557&type=verification&code=5557~JFHXF4LCXA')
+    //     this.getOrderIdFromUrl('https://test.tuanfengkeji.cn/TFShop_Uni_H5/#/pages/jump/jump?orderId=5065&type=verification&code=5065~JFHXUDHQUM')
+    //     // this.getOrderIdFromUrl('https://www.tuanfengkeji.cn/TFShop_Uni_H5/#/pages/jump/jump?orderId=5555&type=verification&code=5557~JFHXF4LCXA')
+    // }, 3000)
+    uni.getSetting({
+      success: (res) => {
+        let flag = res.authSetting["scope.camera"];
+        if (!flag) {
+          this.errorChange();
+        }
+      },
+    });
+  },
+  onShow() {
+    this.lineAnimation();
+  },
+  data() {
+    return {
+      //  扫描线动画
+      animation: {},
+      shopInfo: {},
+      // 控制框显示
+      modal: false,
+      //  弹框显示的内容
+      promptList: [],
+      //   控制弹框按钮
+      showBtn: false,
+    };
+  },
+  methods: {
+    lineAnimation() {
+      this.animation = animation;
+      let that = this;
+      let scode = true;
+      this.timer = setInterval(
+        function() {
+          if (scode) {
+            animation.translateY(260).step({
+              duration: 1500,
+            });
+            scode = !scode;
+          } else {
+            animation.translateY(-10).step({
+              duration: 1500,
+            });
+            scode = !scode;
+          }
+          that.animation = animation.export();
+        }.bind(this),
+        1500
+      );
     },
-    onShow() {
-        this.lineAnimation()
+    //  关闭弹框
+    //  关闭弹框
+    closeModal() {
+      this.modal = false;
     },
-    data() {
-        return {
-            //  扫描线动画
-            animation: {},
-            shopInfo: {},
-            // 控制框显示
-            modal: false,
-            //  弹框显示的内容
-            promptList: [],
-        }
+    // 相机初始化完成回调函数
+    onCameraInitDone() {
+      // setInterval(() => {
+      // 	this.$refs.camera.scanCode();
+      // }, 1000);
     },
-    methods: {
-        lineAnimation() {
-            this.animation = animation;
-            let that = this;
-            let scode = true;
-            this.timer = setInterval(
-                function () {
-                    if (scode) {
-                        animation.translateY(260).step({
-                            duration: 1500,
-                        });
-                        scode = !scode;
-                    } else {
-                        animation.translateY(-10).step({
-                            duration: 1500,
-                        });
-                        scode = !scode;
-                    }
-                    that.animation = animation.export();
-                }.bind(this),
-                1500
-            );
-        },
-        //  关闭弹框
-        //  关闭弹框
-        closeModal() {
-            this.modal = false
-        },
-        // 相机初始化完成回调函数
-        onCameraInitDone() {
-            // setInterval(() => {
-            // 	this.$refs.camera.scanCode();
-            // }, 1000);
-        },
-        /**扫码成功*/
-        onScancode(e) {
-            // uni.showModal({
-            //     title: '提示',
-            //     content: e,
-            // });
-            console.log(e.detail.result);
-            this.getOrderIdFromUrl(e.detail.result)
-        },
-        //  获取订单
-        getOrderIdFromUrl(url) {
-            try {
-                let march = url.match(/orderId=(\d+)/)
-                //  传递值过去
-                uni.navigateTo({
-                    url: '/pages_module/orderVerifica/index?orderId=' + march[1]
-                })
-            } catch (error) {
-                this.modal = true
-                this.promptList = ['此二维码/条码无效', '请扫描正常的二维码/条码']
-            }
-        },
-        //  打开相册
-        openAlbum() {
-            uni.chooseImage({
-                count: 1, // 最多可以选择的图片张数
-                sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-                sourceType: ['album'], // 选择图片的来源，相册
-                success: function (res) {
-                    // console.log(res,res.tempFiles[0].path);
-                    uni.scanCode({
-                        path: res.tempFiles[0].path,
-                        success: function (res) {
-                            console.log('二维码内容为：' + res.result)
-                        },
-                        fail: function (res) {
-                            console.log('识别二维码失败')
-                        }
-                    })
-                }
-            })
-        },
-        // 去到输入验劵
-        goCoupons() {
-            uni.navigateTo({
-                url: '/pages_module/scanCoupons/index'
-            })
+    // 用户不同意使用摄像头
+    errorChange(e) {
+      this.showBtn = true;
+      this.modal = true;
+      this.promptList = ["摄像头权限未开启", "请在设置中打开摄像头权限"];
+    },
+    //  相机初始化完成
+    cameraReady() {
+      this.modal = false;
+      console.log("初始化完成了，打卡时间可达时间跨度");
+    },
+    /**扫码成功*/
+    onScancode(e) {
+        console.log(e.detail.result);
+      this.getOrderIdFromUrl(e.detail.result);
+    },
+    //  获取订单
+    getOrderIdFromUrl(url) {
+      try {
+        let march = url.match(/orderId=(\d+)/);
+        let marchTwo = url.match(/code=([^&]*)/);
+        //  传递值过去
+        uni.navigateTo({
+          url: `/pages_module/orderVerifica/index?orderId=${march[1]}&code=${marchTwo[1]}`,
+        });
+      } catch (error) {
+        this.modal = true;
+        this.showBtn = false;
+        this.promptList = ["此二维码/条码无效", "请扫描正常的二维码/条码"];
+      }
+    },
+    //  打开相册
+    openAlbum() {
+      uni.chooseImage({
+        count: 1, // 最多可以选择的图片张数
+        sizeType: ["original", "compressed"], // 可以指定是原图还是压缩图，默认二者都有
+        sourceType: ["album"], // 选择图片的来源，相册
+        success: function(res) {
+          // console.log(res,res.tempFiles[0].path);
+          uni.scanCode({
+            path: res.tempFiles[0].path,
+            success: function(res) {
+              console.log("二维码内容为：" + res.result);
+            },
+            fail: function(res) {
+              console.log("识别二维码失败");
+            },
+          });
         },
-        backClick() {
-            // uni.navigateBack()
-            uni.switchTab({
-                 url: '/pages/tabbar/index/index'
+      });
+    },
+    // 去到输入验劵
+    goCoupons() {
+      uni.navigateTo({
+        url: "/pages_module/scanCoupons/index",
+      });
+    },
+    //  确定打开设置
+    btnClick() {
+      this.modal = false;
+      uni.openSetting({
+        success: (res) => {
+          if (res.authSetting["scope.camera"]) {
+            uni.reLaunch({
+              url: "/pages_module/scanCode/index",
             });
-        }
+          }
+        },
+      });
     },
-}
+    backClick() {
+      // uni.navigateBack()
+      uni.switchTab({
+        url: "/pages/tabbar/index/index",
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 %btn {
-    width: 55rpx;
-    height: 13rpx;
-    background-color: #fff;
-    position: relative;
+  width: 55rpx;
+  height: 13rpx;
+  background-color: #fff;
+  position: relative;
 }
 
 %btnAfter {
-    content: '';
-    position: absolute;
-    width: 13rpx;
-    height: 55rpx;
-    background-color: #fff;
+  content: "";
+  position: absolute;
+  width: 13rpx;
+  height: 55rpx;
+  background-color: #fff;
 }
 
 .scanCode {
-    width: 100vw;
-    height: 100vh;
-    background: url("https://jufeng-shop-1317254189.cos.ap-guangzhou.myqcloud.com/1717469011005-bg.png") center;
-    background-size: 100% 100%;
-    position: relative;
-
-    .shop-top {
-        width: 100%;
-        height: 100%;
-        position: relative;
-        z-index: 999;
-        @include flex(center);
+  width: 100vw;
+  height: 100vh;
+  background: url("https://jufeng-shop-1317254189.cos.ap-guangzhou.myqcloud.com/1717469011005-bg.png")
+    center;
+  background-size: 100% 100%;
+  position: relative;
 
-        .back-icon {
-            position: absolute;
-            left: 0;
-            top: 50%;
-            transform: translateY(-50%);
-        }
+  .shop-top {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    z-index: 999;
+    @include flex(center);
 
-        .shop-name {
-            color: #FFFFFF;
-        }
+    .back-icon {
+      position: absolute;
+      left: 0;
+      top: 50%;
+      transform: translateY(-50%);
     }
 
-    .scanning {
-        width: 100%;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        @include flex(center, column, 30rpx);
-
-        .scan-box {
-            width: 452rpx;
-            height: 452rpx;
-            position: relative;
+    .shop-name {
+      color: #ffffff;
+    }
+  }
 
-            .border-box {
-                @extend %btn;
-                position: absolute;
-                left: -5rpx;
-                top: -5rpx;
+  .scanning {
+    width: 100%;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    @include flex(center, column, 30rpx);
 
-                &::after {
-                    @extend %btnAfter;
-                    left: -2rpx;
-                    top: 0;
-                }
-            }
+    .scan-box {
+      width: 452rpx;
+      height: 452rpx;
+      position: relative;
 
-            .border-box2 {
-                @extend %btn;
-                position: absolute;
-                right: -5rpx;
-                top: -5rpx;
+      .border-box {
+        @extend %btn;
+        position: absolute;
+        left: -5rpx;
+        top: -5rpx;
 
-                &::after {
-                    @extend %btnAfter;
-                    right: -2rpx;
-                    top: 0;
-                }
-            }
+        &::after {
+          @extend %btnAfter;
+          left: -2rpx;
+          top: 0;
+        }
+      }
 
-            .border-box3 {
-                @extend %btn;
-                position: absolute;
-                right: -5rpx;
-                bottom: -5rpx;
+      .border-box2 {
+        @extend %btn;
+        position: absolute;
+        right: -5rpx;
+        top: -5rpx;
 
-                &::after {
-                    @extend %btnAfter;
-                    right: -2rpx;
-                    bottom: 0;
-                }
-            }
+        &::after {
+          @extend %btnAfter;
+          right: -2rpx;
+          top: 0;
+        }
+      }
 
-            .border-box4 {
-                @extend %btn;
-                position: absolute;
-                left: -5rpx;
-                bottom: -5rpx;
+      .border-box3 {
+        @extend %btn;
+        position: absolute;
+        right: -5rpx;
+        bottom: -5rpx;
 
-                &::after {
-                    @extend %btnAfter;
-                    left: -2rpx;
-                    bottom: 0;
-                }
-            }
+        &::after {
+          @extend %btnAfter;
+          right: -2rpx;
+          bottom: 0;
+        }
+      }
 
-            .scan-camera {
-                width: 100%;
-                height: 100%;
-            }
+      .border-box4 {
+        @extend %btn;
+        position: absolute;
+        left: -5rpx;
+        bottom: -5rpx;
 
-            .scan-animation {
-                position: absolute;
-                top: 5%;
-                left: 0;
-                width: 100%;
-                height: 3rpx;
-                background-color: $primary-color;
-                border-radius: 50%;
-            }
+        &::after {
+          @extend %btnAfter;
+          left: -2rpx;
+          bottom: 0;
         }
+      }
 
-        .scab-txt {
-            font-size: 28rpx;
-            color: #FFFFFF;
-        }
-    }
+      .scan-camera {
+        width: 100%;
+        height: 100%;
+      }
 
-    .btn-list {
+      .scan-animation {
         position: absolute;
-        left: 50%;
-        bottom: 104rpx;
-        transform: translateX(-50%);
-        @include flex(center, null, 60rpx);
+        top: 5%;
+        left: 0;
+        width: 100%;
+        height: 3rpx;
+        background-color: $primary-color;
+        border-radius: 50%;
+      }
+    }
+
+    .scab-txt {
+      font-size: 28rpx;
+      color: #ffffff;
+    }
+  }
 
-        .btn {
-            width: 276rpx;
-            height: 108rpx;
-            background: rgba(255, 255, 255, 0.4);
-            @include flex(center, null, 22rpx);
-            border-radius: 24rpx;
+  .btn-list {
+    position: absolute;
+    left: 50%;
+    bottom: 104rpx;
+    transform: translateX(-50%);
+    @include flex(center, null, 60rpx);
+    display: none;
+    .btn {
+      width: 276rpx;
+      height: 108rpx;
+      background: rgba(255, 255, 255, 0.4);
+      @include flex(center, null, 22rpx);
+      border-radius: 24rpx;
 
-            image {
-                width: 44rpx;
-                height: 36rpx;
-                display: block;
-            }
+      image {
+        width: 44rpx;
+        height: 36rpx;
+        display: block;
+      }
 
-            text {
-                font-size: 36rpx;
-                color: #E6E4E5;
-            }
-        }
+      text {
+        font-size: 36rpx;
+        color: #e6e4e5;
+      }
     }
-
+  }
 }
-</style>
+</style>

user_module/changeLogo/index.vue

@@ -46,7 +46,7 @@ export default {
       //  加载状态
       this.$loading.show("更新中");
       uni.uploadFile({
-        url: "https://nsbusinessapi.tuanfengkeji.cn/file/upload", //仅为示例，非真实的接口地址
+        url: `${process.env.UNI_BASE_URL}/file/upload`, //仅为示例，非真实的接口地址
         filePath: file,
         header: {
           "Content-Type": "application/json; charset=UTF-8",

user_module/codeDetail/index.vue

@@ -108,7 +108,8 @@ export default {
     async getImage(file) {
       //  加载状态
       uni.uploadFile({
-        url: "https://nsbusinessapi.tuanfengkeji.cn/file/upload", //仅为示例，非真实的接口地址
+        // url: "https://nsbusinessapi.tuanfengkeji.cn/file/upload", //仅为示例，非真实的接口地址
+        url: `${process.env.UNI_BASE_URL}/file/upload`, //仅为示例，非真实的接口地址
         filePath: file,
         header: {
           "Content-Type": "application/json; charset=UTF-8",
@@ -119,7 +120,23 @@ export default {
           user: "code",
         },
         success: (uploadFileRes) => {
-          this.payCode = JSON.parse(uploadFileRes.data).data.url;
+          let res =  JSON.parse(uploadFileRes.data);
+          const tokenerr = [20003, "20003", 20004, "20004", 20005, "20005"];
+          if (tokenerr.includes(res.code)) {
+            //  清除本地缓存所有的数据
+            // uni.clearStorageSync();
+            setTimeout(() => {
+              //  跳转回登陆页面
+              uni.redirectTo({
+                url: "/pages/login/index"
+              });
+            }, 1500);
+
+            this.$showToast("登陆超时，请重新登陆", "none", 1500);
+            this.$loading.hide();
+            return;
+          }
+          this.payCode = res.data.url;
           this.$loading.hide();
         },
       });

utils/request.js

@@ -24,7 +24,6 @@ const request = (requesUrl, data, method = "GET") => {
             //  清除本地缓存所有的数据
             uni.clearStorageSync();
             setTimeout(() => {
-              console.log("这里进来了");
               //  跳转回登陆页面
               uni.redirectTo({
                 url: "/pages/login/index"